Changeset 14497

Timestamp:

05/15/13 06:42:41 (10 years ago)

Author:

rschlatte

Message:

Remove direct references to standard-generic-function class from Java

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• FuncallableStandardObject.java (modified) (1 diff)
• LispObject.java (modified) (1 diff)
• Primitives.java (modified) (1 diff)
• Profiler.java (modified) (1 diff)

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

@@ -195 +195 @@
         }
         FuncallableStandardObject o = new FuncallableStandardObject((Layout)l);
-        if (arg == StandardClass.STANDARD_GENERIC_FUNCTION || Symbol.SUBTYPEP.execute(arg, StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
+        if (Symbol.SUBTYPEP.execute(arg, LispClass.findClass(Symbol.STANDARD_GENERIC_FUNCTION)) != NIL) {
           // KLUDGE: this initialization should be moved Lisp-side
           o.setInstanceSlotValue(Symbol.NAME, NIL);

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

@@ -671 +671 @@
                     ((Symbol)this).setDocumentation(Symbol.FUNCTION, doc);
                     return doc;
-                } else if (fn.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
+                } else if (fn.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
                     return Symbol.SLOT_VALUE.execute(fn, Symbol._DOCUMENTATION);
                 }

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

@@ -4249 +4249 @@
             // will break for generic functions that aren't subclasses
             // of standard-generic-function as well.
-            if (first.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
+            if (first.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
                 ((StandardObject)first).setInstanceSlotValue(Symbol.NAME, second);
                 return second;

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

@@ -73 +73 @@
                             object.setHotCount(0);
                             LispObject methods = null;
-                            if (object.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
+                            if (object.typep(Symbol.STANDARD_GENERIC_FUNCTION) != NIL) {
                                 methods =
                                     Symbol.GENERIC_FUNCTION_METHODS.execute(object);