Changeset 4345

Timestamp:

10/13/03 13:10:03 (18 years ago)

Author:

piso

Message:

FUNCALL: recognize generic functions.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (5 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.472 2003-10-13 11:40:12 piso Exp $
+ * $Id: Primitives.java,v 1.473 2003-10-13 13:10:03 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -2087 +2087 @@
             else
                 fun = arg;
-            if (fun instanceof Function)
+            if (fun instanceof Function || fun instanceof GenericFunction)
                 return funcall0(fun, LispThread.currentThread());
             throw new ConditionThrowable(new UndefinedFunction(arg));
@@ -2099 +2099 @@
             else
                 fun = first;
-            if (fun instanceof Function)
+            if (fun instanceof Function || fun instanceof GenericFunction)
                 return funcall1(fun, second, LispThread.currentThread());
             throw new ConditionThrowable(new UndefinedFunction(first));
@@ -2112 +2112 @@
             else
                 fun = first;
-            if (fun instanceof Function)
+            if (fun instanceof Function || fun instanceof GenericFunction)
                 return funcall2(fun, second, third, LispThread.currentThread());
             throw new ConditionThrowable(new UndefinedFunction(first));
@@ -2125 +2125 @@
             else
                 fun = args[0];
-            if (fun instanceof Function) {
+            if (fun instanceof Function || fun instanceof GenericFunction) {
                 final int length = args.length - 1; // Number of arguments.
                 if (length == 3) {