[armedbear-cvs] r12470 - branches/metaclass/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Feb 14 04:23:14 2010
New Revision: 12470

Log:
Check for LISTP instead of CONSP
  and remove the resulting special case.

Modified:
   branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java

Modified: branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java
==============================================================================
--- branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java	(original)
+++ branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java	Sun Feb 14 04:23:14 2010
@@ -74,10 +74,7 @@
       super(layoutStandardClass);
       setDirectSuperclasses(NIL);
       setDirectSubclasses(NIL);
-
-      // because of the assert below, we need to set the slot directly
-      // and can't use setCPL()
-      setInstanceSlotValue(symClassPrecedenceList, NIL);
+      setCPL(NIL);
   }
 
   public StandardClass(Symbol symbol, LispObject directSuperclasses)
@@ -85,10 +82,7 @@
       super(layoutStandardClass,
             symbol, directSuperclasses);
       setDirectSubclasses(NIL);
-
-      // because of the assert below, we need to set the slot directly
-      // and can't use setCPL()
-      setInstanceSlotValue(symClassPrecedenceList, NIL);
+      setCPL(NIL);
   }
 
   @Override
@@ -150,7 +144,7 @@
   public void setCPL(LispObject... cpl)
   {
     LispObject obj1 = cpl[0];
-    if (obj1 instanceof Cons && cpl.length == 1)
+    if (obj1.listp() && cpl.length == 1)
       setInstanceSlotValue(symClassPrecedenceList, obj1);
     else
       {