Changeset 14494

Timestamp:

05/07/13 08:01:24 (10 years ago)

Author:

rschlatte

Message:

Remove casts to StandardGenericFunction?

Replaced with function invocations / slot access.

Also remove some outdated comments.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Primitives.java (modified) (3 diffs)
• Symbol.java (modified) (1 diff)
• mop.lisp (modified) (1 diff)

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

@@ -2658 +2658 @@
                 value2 = T;
                 value3 = ((Function)arg).getLambdaName();
-            } else if (arg instanceof StandardGenericFunction) {
+            } else if (arg.typep(StandardClass.GENERIC_FUNCTION) != NIL) {
                 value1 = NIL;
                 value2 = T;
-                value3 = ((StandardGenericFunction)arg).getInstanceSlotValue(Symbol.NAME);
+                value3 = Symbol.GENERIC_FUNCTION_NAME.execute(arg);
             } else if (arg instanceof FuncallableStandardObject) {
               return this.execute(((FuncallableStandardObject)arg).function);
@@ -4221 +4221 @@
                 return ((Operator)arg).getLambdaName();
             }
-            if (arg instanceof StandardGenericFunction) {
-                return ((StandardGenericFunction)arg).getInstanceSlotValue(Symbol.NAME);
+            if (arg.typep(StandardClass.GENERIC_FUNCTION) != NIL) {
+                return Symbol.GENERIC_FUNCTION_NAME.execute(arg);
             }
             if (arg instanceof FuncallableStandardObject) {
@@ -4246 +4246 @@
                 return second;
             }
-            if (first instanceof StandardGenericFunction) {
-                ((StandardGenericFunction)first).setInstanceSlotValue(Symbol.NAME, second);
+            // KLUDGE: this isn't fully general, but lots of other stuff
+            // will break for generic functions that aren't subclasses
+            // of standard-generic-function as well.
+            if (first.typep(StandardClass.STANDARD_GENERIC_FUNCTION) != NIL) {
+                ((StandardObject)first).setInstanceSlotValue(Symbol.NAME, second);
                 return second;
             }

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

@@ -3006 +3006 @@
   public static final Symbol GENERIC_FUNCTION_METHODS =
     PACKAGE_MOP.addExternalSymbol("GENERIC-FUNCTION-METHODS");
+  public static final Symbol GENERIC_FUNCTION_NAME =
+    PACKAGE_MOP.addExternalSymbol("GENERIC-FUNCTION-NAME");
   public static final Symbol METAOBJECT =
     PACKAGE_MOP.addExternalSymbol("METAOBJECT");

trunk/abcl/src/org/armedbear/lisp/mop.lisp

@@ -1 @@
-;;;; Does not currently include all the MOP, but it should.
+
 
 (in-package #:mop)
-
-;;; StandardGenericFunction.java defines FUNCALLABLE-INSTANCE-FUNCTION and
-;;; SET-FUNCALLABLE-INSTANCE-FUNCTION.
-;;;
-;;; TODO 
-;;;
-;;;   1. Verify that we can make FUNCALLABLE-STANDARD-CLASS instances
-;;;      which work.
-;;;
-;;;   2. Tighten the type checks so that only instances of
-;;;      FUNCALLABLE-STANDARD-CLASS are callable.
 
 ;;; AMOP pg. 240ff.