Changeset 12598

Timestamp:

04/10/10 21:03:12 (13 years ago)

Author:

vvoutilainen

Message:

Make listp/endp/SYMBOLP final.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Cons.java (modified) (1 diff)
• LispObject.java (modified) (2 diffs)
• Nil.java (modified) (1 diff)
• Symbol.java (modified) (1 diff)

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

@@ -328 +328 @@
       return type_error(cdr, Symbol.LIST);
     return this;
-  }
-
-  @Override
-  public final boolean listp()
-  {
-    return true;
-  }
-
-  @Override
-  public final boolean endp()
-  {
-    return false;
   }
 

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

@@ -594 +594 @@
   }
 
-  public LispObject SYMBOLP()
-  {
-    return NIL;
-  }
-
-  public boolean listp()
-  {
-    return false;
+  public final LispObject SYMBOLP()
+  {
+    return (this instanceof Symbol) ? T : NIL;
+  }
+
+  public final boolean listp()
+  {
+    return (this instanceof Cons) || (this instanceof Nil);
   }
 
@@ -609 +609 @@
   }
 
-  public boolean endp()
-  {
+  public final boolean endp()
+  {
+    if (this instanceof Cons)
+        return false;
+    else if (this instanceof Nil)
+        return true;
     type_error(this, Symbol.LIST);
     // Not reached.

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

@@ -147 +147 @@
 
     @Override
-    public boolean listp()
-    {
-        return true;
-    }
-
-    @Override
-    public boolean endp()
-    {
-        return true;
-    }
-
-    @Override
     public LispObject NOT()
     {

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

@@ -166 +166 @@
       return this == T ? T : NIL;
     return super.typep(type);
-  }
-
-  @Override
-  public final LispObject SYMBOLP()
-  {
-    return T;
   }