Changeset 11301

Timestamp:

09/01/08 20:27:54 (14 years ago)

Author:

ehuelsmann

Message:

Revert last fix: it's not clhs compliant (See 11.1.1;
specifically the treatment of the NIL symbol).

Location:

trunk/j/src/org/armedbear/lisp

Files:

• PackageFunctions.java (modified) (1 diff)
• package.lisp (modified) (1 diff)

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

@@ -90 +90 @@
             Package pkg =
                 args.length == 2 ? coerceToPackage(args[1]) : getCurrentPackage();
-            if (symbols instanceof Symbol)
-                pkg.importSymbol(checkSymbol(symbols));
-            else {
+            if (symbols.listp()) {
                 while (symbols != NIL) {
                     pkg.importSymbol(checkSymbol(symbols.car()));
                     symbols = symbols.cdr();
                 }
-            }
+            } else
+                pkg.importSymbol(checkSymbol(symbols));
             return T;
         }

trunk/j/src/org/armedbear/lisp/package.lisp

@@ -62 +62 @@
 
 (defun import (symbols &optional (package *package* package-supplied-p))
-  (dolist (symbol (if (symbolp symbols) (list symbols) symbols))
+  (dolist (symbol (if (listp symbols) symbols (list symbols)))
     (let* ((sym-name (string symbol))
            (local-sym (find-symbol sym-name package)))