Changeset 4326

Timestamp:

10/12/03 16:13:54 (19 years ago)

Author:

piso

Message:

ALLOCATE-STD-INSTANCE: added specific support for generic function objects.

File:

• trunk/j/src/org/armedbear/lisp/StandardObject.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StandardObject.java,v 1.7 2003-10-12 03:37:52 piso Exp $
+ * $Id: StandardObject.java,v 1.8 2003-10-12 16:13:54 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -32 +32 @@
     }
 
-    private StandardObject(LispClass cls, LispObject slots)
+    protected StandardObject(LispClass cls, LispObject slots)
     {
         this.cls = cls;
@@ -105 +105 @@
             if (first == BuiltInClass.STANDARD_CLASS)
                 return new StandardClass();
-            if (first instanceof LispClass)
+            if (first instanceof LispClass) {
+                Symbol symbol = ((LispClass)first).getSymbol();
+                if (symbol == Symbol.STANDARD_GENERIC_FUNCTION)
+                    return new GenericFunction((LispClass)first, second);
                 return new StandardObject((LispClass)first, second);
+            }
             throw new ConditionThrowable(new TypeError(first, "class"));
         }