Changeset 11322

Timestamp:

09/17/08 21:27:52 (15 years ago)

Author:

ehuelsmann

Message:

Add declaration processing in MACROLET bodies.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (2 diffs)

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

@@ -3500 +3500 @@
         LispObject defs = checkList(args.car());
         final LispThread thread = LispThread.currentThread();
-        LispObject result;
-        if (defs != NIL)
+        final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
+
+        try
           {
             Environment ext = new Environment(env);
@@ -3518 +3519 @@
                 defs = defs.cdr();
               }
-            result = progn(args.cdr(), ext, thread);
-          }
-        else
-          result = progn(args.cdr(), env, thread);
-        return result;
+            return progn(ext.processDeclarations(args.cdr()), ext, thread);
+          }
+        finally
+          {
+            thread.lastSpecialBinding = lastSpecialBinding;
+          }
       }
     };