Changeset 4546

Timestamp:

10/26/03 18:55:35 (18 years ago)

Author:

piso

Message:

macroexpand_1(): symbol macro support.

File:

• trunk/j/src/org/armedbear/lisp/Lisp.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Lisp.java,v 1.169 2003-10-25 21:53:57 piso Exp $
+ * $Id: Lisp.java,v 1.170 2003-10-26 18:55:35 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -248 +248 @@
                 }
                 if (obj instanceof SpecialOperator)
-                    obj = Primitives.get((Symbol)car,
-                        Symbol.MACROEXPAND_MACRO, NIL);
+                    obj = Primitives.get((Symbol)car, Symbol.MACROEXPAND_MACRO,
+                                         NIL);
                 if (obj instanceof MacroObject) {
                     LispObject expander = ((MacroObject)obj).getExpander();
@@ -259 +259 @@
                     return results[0];
                 }
+            }
+        } else if (form instanceof Symbol) {
+            Symbol symbol = (Symbol) form;
+            LispObject obj = null;
+            if (symbol.isSpecialVariable())
+                obj = thread.lookupSpecial(symbol);
+            else
+                obj = env.lookup(symbol);
+            if (obj == null)
+                obj = symbol.getSymbolValue();
+            if (obj instanceof SymbolMacro) {
+                results[0] = ((SymbolMacro)obj).getExpansion();
+                results[1] = T;
+                thread.setValues(results);
+                return results[0];
             }
         }