Changeset 4312

Timestamp:

10/11/03 18:49:18 (19 years ago)

Author:

piso

Message:

Moved CLASS-DIRECT-METHODS and %SET-CLASS-DIRECT-METHODS to LispClass?.java.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (3 diffs)
• StandardClass.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.86 2003-10-11 00:17:51 piso Exp $
+ * $Id: Autoload.java,v 1.87 2003-10-11 18:49:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -253 +253 @@
         autoload(PACKAGE_SYS, "%open-input-file", "open");
         autoload(PACKAGE_SYS, "%open-output-file", "open");
-        autoload(PACKAGE_SYS, "%set-class-direct-methods", "StandardClass");
+        autoload(PACKAGE_SYS, "%set-class-direct-methods", "LispClass");
         autoload(PACKAGE_SYS, "%set-class-direct-slots", "StandardClass");
         autoload(PACKAGE_SYS, "%set-class-slots", "StandardClass");
@@ -281 +281 @@
         autoload(PACKAGE_SYS, "%time", "Time");
         autoload(PACKAGE_SYS, "allocate-std-instance", "StandardObject");
-        autoload(PACKAGE_SYS, "class-direct-methods", "StandardClass");
+        autoload(PACKAGE_SYS, "class-direct-methods", "LispClass");
         autoload(PACKAGE_SYS, "class-direct-slots", "StandardClass");
         autoload(PACKAGE_SYS, "class-slots", "StandardClass");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StandardClass.java,v 1.10 2003-10-11 02:06:38 piso Exp $
+ * $Id: StandardClass.java,v 1.11 2003-10-11 18:48:46 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -26 +26 @@
     private LispObject directSlots = NIL;
     private LispObject effectiveSlots = NIL;
-    private LispObject directMethods = NIL;
 
     public StandardClass()
@@ -123 +122 @@
         }
     };
-
-    // ### class-direct-methods
-    private static final Primitive1 CLASS_DIRECT_METHODS =
-        new Primitive1("class-direct-methods", PACKAGE_SYS, false)
-    {
-        public LispObject execute(LispObject arg)
-            throws ConditionThrowable
-        {
-            if (arg instanceof StandardClass)
-                return ((StandardClass)arg).directMethods;
-            throw new ConditionThrowable(new TypeError(arg, "standard class"));
-        }
-    };
-
-    // ### %set-class-direct-methods
-    private static final Primitive2 _SET_CLASS_DIRECT_METHODS =
-        new Primitive2("%set-class-direct-methods", PACKAGE_SYS, false)
-    {
-        public LispObject execute(LispObject first, LispObject second)
-            throws ConditionThrowable
-        {
-            if (first instanceof StandardClass) {
-                ((StandardClass)first).directMethods = second;
-                return second;
-            }
-            throw new ConditionThrowable(new TypeError(first, "standard class"));
-        }
-    };
 }