Changeset 12287

Timestamp:

11/29/09 20:23:08 (14 years ago)

Author:

vvoutilainen

Message:

Make LispObject.push() final.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Cons.java (modified) (1 diff)
• LispObject.java (modified) (1 diff)
• Nil.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Cons.java

@@ -164 +164 @@
       }
     return result;
-  }
-
-  @Override
-  public final LispObject push(LispObject obj)
-  {
-    return new Cons(obj, this);
   }
 

trunk/abcl/src/org/armedbear/lisp/LispObject.java

@@ -199 +199 @@
   }
 
-  public LispObject push(LispObject obj)
-  {
+  public final LispObject push(LispObject obj)
+  {
+    if (this instanceof Cons) {
+      return new Cons(obj, this);
+    } else if (this instanceof Nil) {
+      return new Cons(obj);
+    }
     return type_error(this, Symbol.LIST);
   }

trunk/abcl/src/org/armedbear/lisp/Nil.java

@@ -139 +139 @@
 
     @Override
-    public LispObject push(LispObject obj)
-    {
-        return new Cons(obj);
-    }
-
-    @Override
     public LispObject NTH(int index)
     {