Changeset 11441

Timestamp:

12/14/08 12:07:52 (13 years ago)

Author:

ehuelsmann

Message:

Fix compiled MACROLET.13 and MACROLET.14: MACROEXPAND should know about symbol macros while expanding.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Environment.java (modified) (1 diff)
• Primitives.java (modified) (1 diff)
• SymbolMacro.java (modified) (1 diff)
• precompiler.lisp (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Environment.java

@@ -309 +309 @@
     };
 
+  // ### environment-add-symbol-binding
+  public static final Primitive ENVIRONMENT_ADD_SYMBOL_BINDING =
+    new Primitive("environment-add-symbol-binding", PACKAGE_SYS, true,
+                  "environment symbol value")
+    {
+      @Override
+      public LispObject execute(LispObject first, LispObject second,
+                                LispObject third)
+        throws ConditionThrowable
+      {
+        checkEnvironment(first).bind(checkSymbol(second), third);
+        return first;
+      }
+    };
+    
   // ### empty-environment-p
   private static final Primitive EMPTY_ENVIRONMENT_P =

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -1728 +1728 @@
       }
     };
+
+  // ### make-symbol-macro
+  private static final Primitive MAKE_SYMBOL_MACRO =
+      new Primitive("make-symbol-macro", PACKAGE_SYS, true, "expansion")
+  {
+      public LispObject execute(LispObject arg) throws ConditionThrowable
+      {
+          return new SymbolMacro(arg);
+      }
+  };
+
 
   // ### %defparameter

trunk/j/src/org/armedbear/lisp/SymbolMacro.java

@@ -48 +48 @@
     }
 
-    // ### make-symbol-macro
-    private static final Primitive MAKE_MACRO =
-        new Primitive("make-symbol-macro", PACKAGE_SYS, false)
-    {
-        public LispObject execute(LispObject arg) throws ConditionThrowable
-        {
-            return new SymbolMacro(arg);
-        }
-    };
 }

trunk/j/src/org/armedbear/lisp/precompiler.lisp

@@ -720 +720 @@
 (defun precompile-symbol-macrolet (form)
   (let ((*local-variables* *local-variables*)
+        (*compile-file-environment*
+         (make-environment *compile-file-environment*))
         (defs (cadr form)))
     (dolist (def defs)
@@ -728 +730 @@
                  :format-control "Attempt to bind the special variable ~S with SYMBOL-MACROLET."
                  :format-arguments (list sym)))
-        (push (list sym :symbol-macro expansion) *local-variables*)))
+        (push (list sym :symbol-macro expansion) *local-variables*)
+        (environment-add-symbol-binding *compile-file-environment*
+                                        sym
+                                        (sys::make-symbol-macro expansion))
+        ))
     (multiple-value-bind (body decls)
         (parse-body (cddr form) nil)