Changeset 14482

Timestamp:

04/24/13 12:51:25 (9 years ago)

Author:

rschlatte

Message:

Move forward-referenced-class metaclass definition into Lisp

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• StandardClass.java (modified) (3 diffs)
• Symbol.java (modified) (1 diff)
• clos.lisp (modified) (3 diffs)

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

@@ -470 +470 @@
   public static final StandardClass BUILT_IN_CLASS =
     addStandardClass(Symbol.BUILT_IN_CLASS, list(CLASS));
-
-  public static final StandardClass FORWARD_REFERENCED_CLASS =
-    addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list(CLASS));
 
   public static final StandardClass FUNCALLABLE_STANDARD_CLASS =
@@ -644 +641 @@
                                     ERROR, SERIOUS_CONDITION, CONDITION,
                                     STANDARD_OBJECT, BuiltInClass.CLASS_T);
-    FORWARD_REFERENCED_CLASS.setCPL(FORWARD_REFERENCED_CLASS, CLASS,
-                                    SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
-    // Not all of these slots are necessary, but for now we take the
-    // standard layout.  Instances of this class will be redefined and
-    // get a new layout in due course.
-    FORWARD_REFERENCED_CLASS.setClassLayout(layoutStandardClass);
-    FORWARD_REFERENCED_CLASS.setDirectSlotDefinitions(standardClassSlotDefinitions());
     FUNCALLABLE_STANDARD_OBJECT.setCPL(FUNCALLABLE_STANDARD_OBJECT,
                                        STANDARD_OBJECT, BuiltInClass.FUNCTION,
@@ -756 +746 @@
     FUNCALLABLE_STANDARD_OBJECT.finalizeClass();
     FUNCALLABLE_STANDARD_CLASS.finalizeClass();
-    FORWARD_REFERENCED_CLASS.finalizeClass();
     GENERIC_FUNCTION.finalizeClass();
     ARITHMETIC_ERROR.finalizeClass();

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

@@ -3097 +3097 @@
   public static final Symbol FLOAT_OVERFLOW_MODE =
     PACKAGE_SYS.addExternalSymbol("FLOAT-OVERFLOW-MODE");
-  public static final Symbol FORWARD_REFERENCED_CLASS =
-    PACKAGE_SYS.addExternalSymbol("FORWARD-REFERENCED-CLASS");
   public static final Symbol GETHASH1 =
     PACKAGE_SYS.addExternalSymbol("GETHASH1");

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

@@ -119 +119 @@
   (find-class 'funcallable-standard-object))
 (defconstant +the-standard-method-class+ (find-class 'standard-method))
-(defconstant +the-forward-referenced-class+
-  (find-class 'forward-referenced-class))
 (defconstant +the-standard-generic-function-class+
   (find-class 'standard-generic-function))
@@ -209 +207 @@
                     'standard-effective-slot-definition)
     (add-subclasses 'class
-                    '(built-in-class forward-referenced-class standard-class
-                      funcallable-standard-class))))
+                    '(built-in-class standard-class funcallable-standard-class))))
 (fixup-standard-class-hierarchy)
 
@@ -953 +950 @@
 (defconstant +the-structure-class+ (find-class 'structure-class))
 
+(define-primordial-class forward-referenced-class (class)
+  ;; The standard-class layout.  Not all of these slots are necessary,
+  ;; but at least NAME and DIRECT-SUBCLASSES are.
+  ((sys::name :initarg :name :initform nil)
+   (sys::layout :initform nil)
+   (sys::direct-superclasses :initform nil)
+   (sys::direct-subclasses :initform nil)
+   (sys::precedence-list :initform nil)
+   (sys::direct-methods :initform nil)
+   (sys::direct-slots :initform nil)
+   (sys::slots :initform nil)
+   (sys::direct-default-initargs :initform nil)
+   (sys::default-initargs :initform nil)
+   (sys::finalized-p :initform nil)
+   (sys::%documentation :initform nil)))
+(defconstant +the-forward-referenced-class+
+  (find-class 'forward-referenced-class))
 
 (defvar *extensible-built-in-classes*