Changeset 11301


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/PackageFunctions.java

    r11300 r11301  
    9090            Package pkg =
    9191                args.length == 2 ? coerceToPackage(args[1]) : getCurrentPackage();
    92             if (symbols instanceof Symbol)
    93                 pkg.importSymbol(checkSymbol(symbols));
    94             else {
     92            if (symbols.listp()) {
    9593                while (symbols != NIL) {
    9694                    pkg.importSymbol(checkSymbol(symbols.car()));
    9795                    symbols = symbols.cdr();
    9896                }
    99             }
     97            } else
     98                pkg.importSymbol(checkSymbol(symbols));
    10099            return T;
    101100        }
  • trunk/j/src/org/armedbear/lisp/package.lisp

    r11300 r11301  
    6262
    6363(defun import (symbols &optional (package *package* package-supplied-p))
    64   (dolist (symbol (if (symbolp symbols) (list symbols) symbols))
     64  (dolist (symbol (if (listp symbols) symbols (list symbols)))
    6565    (let* ((sym-name (string symbol))
    6666           (local-sym (find-symbol sym-name package)))
Note: See TracChangeset for help on using the changeset viewer.