[armedbear-cvs] r13822 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sun Jan 29 13:14:42 2012
New Revision: 13822

Log:
Fix trunk build after the previous commit.
(Lesson: don't try to limit the scope of your commits 
   -- just let the change flow)

Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	Sun Jan 29 12:56:08 2012	(r13821)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Sun Jan 29 13:14:42 2012	(r13822)
@@ -91,7 +91,7 @@
 
 
   @DocString(name="nil")
-  public static final LispObject NIL = Nil.NIL;
+  public static final Symbol NIL = Nil.NIL;
 
   // We need NIL before we can call usePackage().
   static
@@ -843,9 +843,7 @@
   }
 
   // Environment wrappers.
-  private static final boolean isSpecial(Symbol sym, LispObject ownSpecials,
-                                         Environment env)
-
+  static final boolean isSpecial(Symbol sym, LispObject ownSpecials)
   {
     if (ownSpecials != null)
       {
@@ -865,7 +863,7 @@
                                       Environment env, LispThread thread)
 
   {
-    if (isSpecial(sym, ownSpecials, env)) {
+    if (isSpecial(sym, ownSpecials)) {
       env.declareSpecial(sym);
       thread.bindSpecial(sym, value);
     }
@@ -873,6 +871,17 @@
       env.bind(sym, value);
   }
 
+  public static void bindArg(boolean special, Symbol sym, LispObject value,
+                             Environment env, LispThread thread)
+  {
+      if (special) {
+          env.declareSpecial(sym);
+          thread.bindSpecial(sym, value);
+      }
+      else
+          env.bind(sym, value);
+  }
+
 
   public static final Cons list(LispObject obj1, LispObject... remaining)
   {

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sun Jan 29 12:56:08 2012	(r13821)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sun Jan 29 13:14:42 2012	(r13822)
@@ -95,7 +95,7 @@
 (defknown emit-push-nil () t)
 (declaim (inline emit-push-nil))
 (defun emit-push-nil ()
-  (emit-getstatic +lisp+ "NIL" +lisp-object+))
+  (emit-getstatic +lisp+ "NIL" +lisp-symbol+))
 
 (defknown emit-push-nil-symbol () t)
 (declaim (inline emit-push-nil-symbol))