Changeset 4346

Timestamp:

10/13/03 13:10:37 (19 years ago)

Author:

piso

Message:

ADD-CLASS => %SET-FIND-CLASS

File:

• trunk/j/src/org/armedbear/lisp/LispClass.java (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/LispClass.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: LispClass.java,v 1.32 2003-10-11 18:48:09 piso Exp $
+ * $Id: LispClass.java,v 1.33 2003-10-13 13:10:37 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -171 +171 @@
     }
 
-    // ### add-class
-    private static final Primitive1 ADD_CLASS =
-        new Primitive1("add-class", PACKAGE_SYS, false)
-    {
-        public LispObject execute(LispObject obj) throws ConditionThrowable
-        {
-            if (obj instanceof LispClass) {
-                LispClass c = (LispClass) obj;
-                addClass(c.getSymbol(), c);
-                return c;
-            }
-            throw new ConditionThrowable(new TypeError(this, "class"));
-        }
-    };
-
     // ### find-class
     // find-class symbol &optional errorp environment => class
@@ -222 +207 @@
     };
 
+    // ### %set-find-class
+    private static final Primitive2 _SET_FIND_CLASS =
+        new Primitive2("%set-find-class", PACKAGE_SYS, false)
+    {
+        public LispObject execute(LispObject first, LispObject second)
+            throws ConditionThrowable
+        {
+            Symbol symbol = checkSymbol(first);
+            if (second instanceof LispClass) {
+                addClass(symbol, (LispClass) second);
+                return second;
+            }
+            if (second == NIL) {
+                map.remove(symbol);
+                return second;
+            }
+            throw new ConditionThrowable(new TypeError(second, "class"));
+        }
+    };
+
     // ### class-name
     private static final Primitive1 CLASS_NAME = new Primitive1("class-name")