Changeset 13822


Ignore:
Timestamp:
01/29/12 21:14:42 (9 years ago)
Author:
ehuelsmann
Message:

Fix trunk build after the previous commit.
(Lesson: don't try to limit the scope of your commits

-- just let the change flow)

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r13720 r13822  
    9292
    9393  @DocString(name="nil")
    94   public static final LispObject NIL = Nil.NIL;
     94  public static final Symbol NIL = Nil.NIL;
    9595
    9696  // We need NIL before we can call usePackage().
     
    844844
    845845  // Environment wrappers.
    846   private static final boolean isSpecial(Symbol sym, LispObject ownSpecials,
    847                                          Environment env)
    848 
     846  static final boolean isSpecial(Symbol sym, LispObject ownSpecials)
    849847  {
    850848    if (ownSpecials != null)
     
    866864
    867865  {
    868     if (isSpecial(sym, ownSpecials, env)) {
     866    if (isSpecial(sym, ownSpecials)) {
    869867      env.declareSpecial(sym);
    870868      thread.bindSpecial(sym, value);
     
    872870    else
    873871      env.bind(sym, value);
     872  }
     873
     874  public static void bindArg(boolean special, Symbol sym, LispObject value,
     875                             Environment env, LispThread thread)
     876  {
     877      if (special) {
     878          env.declareSpecial(sym);
     879          thread.bindSpecial(sym, value);
     880      }
     881      else
     882          env.bind(sym, value);
    874883  }
    875884
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r13810 r13822  
    9696(declaim (inline emit-push-nil))
    9797(defun emit-push-nil ()
    98   (emit-getstatic +lisp+ "NIL" +lisp-object+))
     98  (emit-getstatic +lisp+ "NIL" +lisp-symbol+))
    9999
    100100(defknown emit-push-nil-symbol () t)
Note: See TracChangeset for help on using the changeset viewer.