Changeset 14495

Timestamp:

05/08/13 08:34:32 (11 years ago)

Author:

rschlatte

Message:

Remove StandardGenericFunction? class

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• EMFCache.java (modified) (4 diffs)
• FuncallableStandardObject.java (modified) (2 diffs)
• StandardGenericFunction.java (deleted)

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

@@ -54 +54 @@
   }
 
-  static final StandardGenericFunction checkStandardGenericFunction(LispObject obj)
-  {
-    if (obj instanceof StandardGenericFunction)
-      return (StandardGenericFunction) obj;
-    return (StandardGenericFunction) // Not reached.
+  static final FuncallableStandardObject checkStandardGenericFunction(LispObject obj)
+  {
+    if (obj instanceof FuncallableStandardObject)
+      return (FuncallableStandardObject) obj;
+    return (FuncallableStandardObject) // Not reached.
       type_error(obj, Symbol.STANDARD_GENERIC_FUNCTION);
   }
@@ -136 +136 @@
     public LispObject execute(LispObject generic_function, LispObject eql_specializers)
     {
-      final StandardGenericFunction gf = checkStandardGenericFunction(generic_function);
+      final FuncallableStandardObject gf = checkStandardGenericFunction(generic_function);
       EMFCache cache = gf.cache;
       cache.clearCache();
@@ -162 +162 @@
                               LispObject third)
     {
-      final StandardGenericFunction gf = checkStandardGenericFunction(first);
+      final FuncallableStandardObject gf = checkStandardGenericFunction(first);
       EMFCache cache = gf.cache;
       LispObject args = second;
@@ -192 +192 @@
     public LispObject execute(LispObject first, LispObject second)
     {
-      final StandardGenericFunction gf = checkStandardGenericFunction(first);
+      final FuncallableStandardObject gf = checkStandardGenericFunction(first);
       EMFCache cache = gf.cache;
       LispObject args = second;

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

@@ -43 +43 @@
   LispObject function;
 
+  // KLUDGE: this is only needed for generic functions, but doesn't hurt
+  // to have it here.
+  EMFCache cache = new EMFCache();
+
   protected FuncallableStandardObject()
   {
@@ -190 +194 @@
                                + arg.princToString() + ".");
         }
+        FuncallableStandardObject o = new FuncallableStandardObject((Layout)l);
         if (arg == StandardClass.STANDARD_GENERIC_FUNCTION || Symbol.SUBTYPEP.execute(arg, StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
-          return new StandardGenericFunction((Layout)l);
-        } else {
-          return new FuncallableStandardObject((Layout)l);
+          // KLUDGE: this initialization should be moved Lisp-side
+          o.setInstanceSlotValue(Symbol.NAME, NIL);
+          o.setInstanceSlotValue(Symbol.LAMBDA_LIST, NIL);
+          o.setInstanceSlotValue(Symbol.REQUIRED_ARGS, NIL);
+          o.setInstanceSlotValue(Symbol.OPTIONAL_ARGS, NIL);
+          o.setInstanceSlotValue(Symbol.INITIAL_METHODS, NIL);
+          o.setInstanceSlotValue(Symbol.METHODS, NIL);
+          o.setInstanceSlotValue(Symbol.METHOD_CLASS, StandardClass.STANDARD_METHOD);
+          // method combination class set by clos.lisp:shared-initialize :after
+          o.setInstanceSlotValue(Symbol._METHOD_COMBINATION, list(Symbol.STANDARD));
+          o.setInstanceSlotValue(Symbol.ARGUMENT_PRECEDENCE_ORDER, NIL);
+          o.setInstanceSlotValue(Symbol.DECLARATIONS, NIL);
+          o.setInstanceSlotValue(Symbol._DOCUMENTATION, NIL);
         }
+        return o;
       }
       return type_error(arg, Symbol.FUNCALLABLE_STANDARD_CLASS);