Changeset 4612

Timestamp:

11/02/03 18:36:16 (19 years ago)

Author:

piso

Message:

METHOD

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.13 2003-11-02 18:14:46 piso Exp $
+ * $Id: BuiltInClass.java,v 1.14 2003-11-02 18:36:16 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -97 +97 @@
     public static final BuiltInClass LIST                             = addClass(Symbol.LIST);
     public static final BuiltInClass LOGICAL_PATHNAME                 = addClass(Symbol.LOGICAL_PATHNAME);
-    public static final BuiltInClass METHOD                           = addClass(Symbol.METHOD);
+//     public static final BuiltInClass METHOD                           = addClass(Symbol.METHOD);
     public static final BuiltInClass METHOD_COMBINATION               = addClass(Symbol.METHOD_COMBINATION);
     public static final BuiltInClass NULL                             = addClass(Symbol.NULL);
@@ -164 +164 @@
     static {
         addClass(Symbol.GENERIC_FUNCTION, GENERIC_FUNCTION);
+    }
+
+    public static final StandardClass METHOD =
+        new StandardClass(Symbol.METHOD, list1(STANDARD_OBJECT));
+    static {
+        addClass(Symbol.METHOD, METHOD);
     }
 
@@ -246 +252 @@
         LOGICAL_PATHNAME.setDirectSuperclass(PATHNAME);
         LOGICAL_PATHNAME.setCPL(LOGICAL_PATHNAME, PATHNAME, CLASS_T);
-        METHOD.setDirectSuperclass(CLASS_T);
-        METHOD.setCPL(METHOD, CLASS_T);
+        METHOD.setDirectSuperclass(STANDARD_OBJECT);
+        METHOD.setCPL(METHOD, STANDARD_OBJECT, CLASS_T);
         METHOD_COMBINATION.setDirectSuperclass(CLASS_T);
         METHOD_COMBINATION.setCPL(METHOD_COMBINATION, CLASS_T);