Changeset 11294

Timestamp:

08/31/08 01:26:24 (15 years ago)

Author:

ehuelsmann

Message:

Fix IMPORT.ERROR.4 and IMPORT.ERROR.5 ansi-tests.

(We're now at 60 failing tests.)

File:

• trunk/j/src/org/armedbear/lisp/package.lisp (modified) (1 diff)

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

@@ -36 +36 @@
 
 (defun import (symbols &optional (package *package* package-supplied-p))
-  (if package-supplied-p
-      (%import symbols package)
-      (%import symbols)))
-;;attempt to fix the import failures IMPORT.ERROR.4 and .5
-;;   (dolist (symbol (if (listp symbols) symbols (list symbols)))
-;;     (let* ((sym-name (string symbol))
-;;            (local-sym (find-symbol sym-name package)))
-;;       (restart-case
-;;           (progn
-;;             (when (and local-sym (not (eql symbol local-sym)))
-;;               (error 'package-error (format nil "Symbol ~S already accessible in package ~S." local-sym (package-name package))))
-;;             (if package-supplied-p
-;;                 (%import symbol package)
-;;                 (%import symbol)))
-;;         (continue ()
-;;           :report (lambda (s) (format s "Unintern ~S and continue" local-sym))
-;;           (unintern local-sym)
-;;           (%import symbol))
-;;         (abort ()
-;;           :report "Skip symbol")))))
+  (dolist (symbol (if (listp symbols) symbols (list symbols)))
+    (let* ((sym-name (string symbol))
+           (local-sym (find-symbol sym-name package)))
+      (restart-case
+          (progn
+            (when (and local-sym (not (eql symbol local-sym)))
+              (error 'package-error (format nil "Symbol ~S already accessible in package ~S." local-sym (package-name package))))
+            (if package-supplied-p
+                (%import symbol package)
+                (%import symbol)))
+        (unintern-existing ()
+          :report (lambda (s) (format s "Unintern ~S and continue" local-sym))
+          (unintern local-sym)
+          (%import symbol))
+        (skip ()
+          :report "Skip symbol"))))
+  T)