Changeset 14501

Timestamp:

05/15/13 08:06:06 (10 years ago)

Author:

rschlatte

Message:

Move generic-function definition into Lisp

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (4 diffs)
• clos.lisp (modified) (2 diffs)

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

@@ -461 +461 @@
                        list(STANDARD_OBJECT, BuiltInClass.FUNCTION));
 
-  public static final StandardClass GENERIC_FUNCTION =
-    addFuncallableStandardClass(Symbol.GENERIC_FUNCTION,
-                                list(METAOBJECT, FUNCALLABLE_STANDARD_OBJECT));
-
   public static final StandardClass CLASS =
     addStandardClass(Symbol.CLASS, list(SPECIALIZER));
@@ -582 +578 @@
     STANDARD_OBJECT.setDirectSuperclass(BuiltInClass.CLASS_T);
     FUNCALLABLE_STANDARD_OBJECT.setDirectSuperclasses(list(STANDARD_OBJECT, BuiltInClass.FUNCTION));
-    GENERIC_FUNCTION.setDirectSuperclasses(list(METAOBJECT,
-                                                FUNCALLABLE_STANDARD_OBJECT));
-
     ARITHMETIC_ERROR.setCPL(ARITHMETIC_ERROR, ERROR, SERIOUS_CONDITION,
                             CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T);
@@ -640 +633 @@
                                        STANDARD_OBJECT, BuiltInClass.FUNCTION,
                                        BuiltInClass.CLASS_T);
-    GENERIC_FUNCTION.setCPL(GENERIC_FUNCTION, METAOBJECT,
-                            FUNCALLABLE_STANDARD_OBJECT, STANDARD_OBJECT,
-                            BuiltInClass.FUNCTION,
-                            BuiltInClass.CLASS_T);
     JAVA_EXCEPTION.setCPL(JAVA_EXCEPTION, ERROR, SERIOUS_CONDITION, CONDITION,
                           STANDARD_OBJECT, BuiltInClass.CLASS_T);
@@ -742 +731 @@
     FUNCALLABLE_STANDARD_OBJECT.finalizeClass();
     FUNCALLABLE_STANDARD_CLASS.finalizeClass();
-    GENERIC_FUNCTION.finalizeClass();
     ARITHMETIC_ERROR.finalizeClass();
     CELL_ERROR.finalizeClass();

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

@@ -190 +190 @@
     (add-subclasses 'standard-object '(funcallable-standard-object metaobject))
     (add-subclasses 'metaobject
-                    '(generic-function method slot-definition specializer))
+                    '(method slot-definition specializer))
     (add-subclasses 'specializer '(class))
-    (add-subclasses 'funcallable-standard-object 'generic-function)
     (add-subclasses 'method 'standard-method)
     (add-subclasses 'slot-definition
@@ -996 +995 @@
 (defconstant +the-forward-referenced-class+
   (find-class 'forward-referenced-class))
+
+(define-funcallable-primordial-class generic-function
+    (metaobject funcallable-standard-object)
+  ())
 
 (define-funcallable-primordial-class standard-generic-function (generic-function)