Changeset 4304

Timestamp:

10/11/03 02:07:28 (19 years ago)

Author:

piso

Message:

STANDARD_OBJECT

File:

• trunk/j/src/org/armedbear/lisp/BuiltInClass.java (modified) (4 diffs)

trunk/j/src/org/armedbear/lisp/BuiltInClass.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: BuiltInClass.java,v 1.6 2003-09-21 19:31:21 piso Exp $
+ * $Id: BuiltInClass.java,v 1.7 2003-10-11 02:07:28 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -123 +123 @@
     public static final BuiltInClass STANDARD_GENERIC_FUNCTION        = addClass(Symbol.STANDARD_GENERIC_FUNCTION);
     public static final BuiltInClass STANDARD_METHOD                  = addClass(Symbol.STANDARD_METHOD);
-    public static final BuiltInClass STANDARD_OBJECT                  = addClass(Symbol.STANDARD_OBJECT);
+//     public static final BuiltInClass STANDARD_OBJECT                  = addClass(Symbol.STANDARD_OBJECT);
     public static final BuiltInClass STORAGE_CONDITION                = addClass(Symbol.STORAGE_CONDITION);
     public static final BuiltInClass STREAM                           = addClass(Symbol.STREAM);
@@ -141 +141 @@
     public static final BuiltInClass VECTOR                           = addClass(Symbol.VECTOR);
     public static final BuiltInClass WARNING                          = addClass(Symbol.WARNING);
+
+    public static final StandardClass STANDARD_OBJECT =
+        new StandardClass(Symbol.STANDARD_OBJECT,
+                          list1(CLASS_T));
+    static {
+        addClass(Symbol.STANDARD_OBJECT, STANDARD_OBJECT);
+    }
 
     static {
@@ -285 +292 @@
         STANDARD_METHOD.setCPL(STANDARD_METHOD, METHOD, STANDARD_OBJECT,
                                CLASS_T);
-        STANDARD_OBJECT.setDirectSuperclass(CLASS_T);
+//         STANDARD_OBJECT.setDirectSuperclass(CLASS_T);
         STANDARD_OBJECT.setCPL(STANDARD_OBJECT, CLASS_T);
         STORAGE_CONDITION.setDirectSuperclass(SERIOUS_CONDITION);