core: One big eval_apply.

[mes.git] / guile / mes.mes

diff --git a/guile/mes.mes b/guile/mes.mes
index 26793fcac945fd84df48d30ffb9c853b49478302..25e7b25dd4d3ca7d911e9a7a9c6a3ea752069143 100644 (file)
--- a/guile/mes.mes
+++ b/guile/mes.mes
@@ -123,11 +123,11 @@
   (cons %the-unquoters a))
 
 (define (eval-env e a)
   (cons %the-unquoters a))
 
 (define (eval-env e a)

-  (eval-expand (expand-macro-env e a) a))
+  (eval-expand (macro-expand-env e a) a))

 
 

-(define (expand-macro-env e a)
+(define (macro-expand-env e a)

   (if (pair? e) ((lambda (macro)
   (if (pair? e) ((lambda (macro)

-                   (if macro (expand-macro-env (apply-env macro (cdr e) a) a)
+                   (if macro (macro-expand-env (apply-env macro (cdr e) a) a)

                        e))
                  (lookup-macro (car e) a))
       e))
                        e))
                  (lookup-macro (car e) a))
       e))