Changeset 14467

Timestamp:

04/24/13 12:50:43 (10 years ago)

Author:

rschlatte

Message:

make funcallable-standard-object a funcallable-standard-class.

• following SBCL's behavior.

Location:

trunk/abcl

Files:

• doc/manual/abcl.tex (modified) (2 diffs)
• doc/manual/abcl.texi (modified) (1 diff)
• src/org/armedbear/lisp/StandardClass.java (modified) (2 diffs)

trunk/abcl/doc/manual/abcl.tex

@@ -843 +843 @@
 specialization has a corresponding \textsc{URI} whose canonical
 representation is defined to be the \code{NAMESTRING} of the
-\cpde{CL:PATHNAME}. The \code{EXT:JAR-PATHNAME} extension further
+\code{CL:PATHNAME}. The \code{EXT:JAR-PATHNAME} extension further
 specializes the the \code{EXT:URL-PATHNAME} to provide access to
 components of zip archives.  
@@ -1108 +1108 @@
 specified in \textsc{(A)MOP}.  The symbols are exported from the
 package \code{MOP}.
+
+Contrary to the AMOP specification and following \textsc{SBCL}'s lead,
+the metaclass \code{funcallable-standard-object} has
+\code{funcallable-standard-class} as metaclass instead of
+\code{standard-class}.
 
 \subsection{Specializing on Java classes}

trunk/abcl/doc/manual/abcl.texi

@@ -1466 +1466 @@
 The symbols are exported from the package @code{MOP}.
 
+Contrary to the AMOP specification and following SBCL's lead,
+the metaclass @code{funcallable-standard-object} has
+@code{funcallable-standard-class} as metaclass instead of
+@code{standard-class}.
+
 @node Specializing on Java classes
 @subsection Specializing on Java classes

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

@@ -425 +425 @@
   }
 
+  private static final FuncallableStandardClass addFuncallableStandardClass
+    (Symbol name, LispObject directSuperclasses)
+  {
+    FuncallableStandardClass c = new FuncallableStandardClass(name, directSuperclasses);
+    addClass(name, c);
+    return c;
+  }
+
   // At this point, BuiltInClass.java has not been completely loaded yet, and
   // BuiltInClass.CLASS_T is null. So we need to call setDirectSuperclass()
@@ -467 +475 @@
 
   // BuiltInClass.FUNCTION is also null here (see previous comment).
+  // Following SBCL's lead, we make funcallable-standard-object a
+  // funcallable-standard-class.
   public static final StandardClass FUNCALLABLE_STANDARD_OBJECT =
-      addStandardClass(Symbol.FUNCALLABLE_STANDARD_OBJECT,
+      addFuncallableStandardClass(Symbol.FUNCALLABLE_STANDARD_OBJECT,
                        list(STANDARD_OBJECT, BuiltInClass.FUNCTION));
 
   public static final StandardClass GENERIC_FUNCTION =
-    new FuncallableStandardClass(Symbol.GENERIC_FUNCTION,
-                                 list(METAOBJECT, FUNCALLABLE_STANDARD_OBJECT));
-  static {
-    addClass(Symbol.GENERIC_FUNCTION, GENERIC_FUNCTION);
-  }
+    addFuncallableStandardClass(Symbol.GENERIC_FUNCTION,
+                                list(METAOBJECT, FUNCALLABLE_STANDARD_OBJECT));
 
   public static final StandardClass CLASS =