mes: Resurrect macros in repl.
[mes.git] / src / mes.c
index fa68ddeb25f0fa29c8129afa005ad8d625f39ea9..fd2f457fb2f639f72b2e5be07b7f7854b8f41767 100644 (file)
--- a/src/mes.c
+++ b/src/mes.c
@@ -207,7 +207,7 @@ struct scm scm_vm_begin_expand_primitive_load = {TSPECIAL, "*vm:core:begin-expan
 struct scm scm_vm_begin_primitive_load = {TSPECIAL, "*vm:core:begin-primitive-load*",0};
 struct scm scm_vm_macro_expand_car = {TSPECIAL, "*vm:core:macro-expand-car*",0};
 struct scm scm_vm_macro_expand_cdr = {TSPECIAL, "*vm:macro-expand-cdr*",0};
-struct scm scm_vm_begin_expand = {TSPECIAL, "*vm:begin-expand*",0};
+struct scm scm_vm_begin_expand = {TSPECIAL, "core:eval-expand",0};
 struct scm scm_vm_begin_expand_eval = {TSPECIAL, "*vm:begin-expand-eval*",0};
 struct scm scm_vm_begin_expand_macro = {TSPECIAL, "*vm:begin-expand-macro*",0};
 struct scm scm_vm_begin = {TSPECIAL, "*vm-begin*",0};
@@ -1040,6 +1040,11 @@ eval_apply ()
               push_cc (CADR (r1), r1, CADDR (r1), cell_vm_return);
               goto eval;
             }
+          case cell_vm_begin_expand:
+            {
+              push_cc (cons (CADR (r1), cell_nil), r1, CADDR (r1), cell_vm_return);
+              goto begin_expand;
+            }
           case cell_call_with_current_continuation:
             {
               r1 = CDR (r1);