Changeset 11300


Ignore:
Timestamp:
09/01/08 20:09:44 (14 years ago)
Author:
ehuelsmann
Message:

Fix import of NIL symbol.

Location:
trunk/j/src/org/armedbear/lisp
Files:
2 edited

Legend:

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

    r11297 r11300  
    9090            Package pkg =
    9191                args.length == 2 ? coerceToPackage(args[1]) : getCurrentPackage();
    92             if (symbols.listp()) {
     92            if (symbols instanceof Symbol)
     93                pkg.importSymbol(checkSymbol(symbols));
     94            else {
    9395                while (symbols != NIL) {
    9496                    pkg.importSymbol(checkSymbol(symbols.car()));
    9597                    symbols = symbols.cdr();
    9698                }
    97             } else
    98                 pkg.importSymbol(checkSymbol(symbols));
     99            }
    99100            return T;
    100101        }
  • trunk/j/src/org/armedbear/lisp/package.lisp

    r11299 r11300  
    6262
    6363(defun import (symbols &optional (package *package* package-supplied-p))
    64   (dolist (symbol (if (listp symbols) symbols (list symbols)))
     64  (dolist (symbol (if (symbolp symbols) (list symbols) 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.