X-Git-Url: https://jxself.org/git/?p=mes.git;a=blobdiff_plain;f=mes.scm;h=6ec751e9b4e0ba0ead8be6006f87b8105f54856a;hp=e7bf3480d40148d0dad428c560c9bb168d8e46f6;hb=c1886195e61f0d3b7f36c2c7b5af3b57943d1613;hpb=08b1a52af2a91c7828a0ed723609905cd306c866 diff --git a/mes.scm b/mes.scm index e7bf3480..6ec751e9 100755 --- a/mes.scm +++ b/mes.scm @@ -58,7 +58,6 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@" pair? ;; ADDITIONAL PRIMITIVES - apply number? procedure? < @@ -124,7 +123,7 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@" (eval e (append a environment))) (define (apply-environment fn e a) - (apply fn e (append a environment))) + (apply-env fn e (append a environment))) (define (readenv a) (let ((x (guile:read))) @@ -156,7 +155,7 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@" (assq . ,assq) (eval . ,eval-environment) - (apply . ,apply-environment) + (apply-env . ,apply-environment) (readenv . ,readenv) (display . ,guile:display) @@ -205,9 +204,9 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@" (define (loop r e a) (cond ((null? e) r) ((eq? e 'exit) - (apply (cdr (assq 'loop a)) - (cons *unspecified* (cons #t (cons a '()))) - a)) + (apply-env (cdr (assq 'loop a)) + (cons *unspecified* (cons #t (cons a '()))) + a)) ((atom? e) (loop (eval e a) (readenv a) a)) ((eq? (car e) 'define) (loop *unspecified* (readenv a) (cons (mes-define e a) a)))