add scheme apply, rename apply-> apply_env.

[mes.git] / mes.scm

diff --git a/mes.scm b/mes.scm
index e7bf3480d40148d0dad428c560c9bb168d8e46f6..6ec751e9b4e0ba0ead8be6006f87b8105f54856a 100755 (executable)
--- a/mes.scm
+++ b/mes.scm
@@ -58,7 +58,6 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@"
                                 pair?
 
                                 ;; ADDITIONAL PRIMITIVES
                                 pair?
 
                                 ;; ADDITIONAL PRIMITIVES

-                                apply

                                 number?
                                 procedure?
                                 <
                                 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)
   (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)))
 
 (define (readenv a)
   (let ((x (guile:read)))


@@ -156,7 +155,7 @@ exec guile -L $(pwd) -e '(mes)' -s "$0" "$@"
     (assq . ,assq)
 
     (eval . ,eval-environment)
     (assq . ,assq)
 
     (eval . ,eval-environment)

-    (apply . ,apply-environment)
+    (apply-env . ,apply-environment)

 
     (readenv . ,readenv)
     (display . ,guile:display)
 
     (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)
 (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)))
         ((atom? e) (loop (eval e a) (readenv a) a))
         ((eq? (car e) 'define)
          (loop *unspecified* (readenv a) (cons (mes-define e a) a)))