Changeset 4340

Timestamp:

10/13/03 11:40:12 (19 years ago)

Author:

piso

Message:

MAPCAR: recognize generic functions.

File:

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

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.471 2003-10-13 11:35:15 piso Exp $
+ * $Id: Primitives.java,v 1.472 2003-10-13 11:40:12 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -2207 +2207 @@
             if (fun instanceof Symbol)
                 fun = fun.getSymbolFunction();
-            if (!(fun instanceof Function))
+            if (!(fun instanceof Function || fun instanceof GenericFunction))
                 throw new ConditionThrowable(new UndefinedFunction(first));
             // Second argument must be a list.
@@ -2235 +2235 @@
             if (fun instanceof Symbol)
                 fun = fun.getSymbolFunction();
-            if (!(fun instanceof Function))
+            if (!(fun instanceof Function || fun instanceof GenericFunction))
                 throw new ConditionThrowable(new UndefinedFunction(first));
             // Remaining arguments must be lists.
@@ -2268 +2268 @@
             if (fun instanceof Symbol)
                 fun = fun.getSymbolFunction();
-            if (!(fun instanceof Function))
+            if (!(fun instanceof Function || fun instanceof GenericFunction))
                 throw new ConditionThrowable(new UndefinedFunction(args[0]));
             // Remaining arguments must be lists.