Changeset 12470

Timestamp:

02/14/10 09:23:14 (13 years ago)

Author:

ehuelsmann

Message:

Check for LISTP instead of CONSP

and remove the resulting special case.

File:

• branches/metaclass/abcl/src/org/armedbear/lisp/StandardClass.java (modified) (3 diffs)

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

@@ -75 +75 @@
       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);
   }
 
@@ -86 +83 @@
             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);
   }
 
@@ -151 +145 @@
   {
     LispObject obj1 = cpl[0];
-    if (obj1 instanceof Cons && cpl.length == 1)
+    if (obj1.listp() && cpl.length == 1)
       setInstanceSlotValue(symClassPrecedenceList, obj1);
     else