Changeset 11294


Ignore:
Timestamp:
08/31/08 01:26:24 (14 years ago)
Author:
ehuelsmann
Message:

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

(We're now at 60 failing tests.)

File:
1 edited

Legend:

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

    r11292 r11294  
    3636
    3737(defun import (symbols &optional (package *package* package-supplied-p))
    38   (if package-supplied-p
    39       (%import symbols package)
    40       (%import symbols)))
    41 ;;attempt to fix the import failures IMPORT.ERROR.4 and .5
    42 ;;   (dolist (symbol (if (listp symbols) symbols (list symbols)))
    43 ;;     (let* ((sym-name (string symbol))
    44 ;;            (local-sym (find-symbol sym-name package)))
    45 ;;       (restart-case
    46 ;;           (progn
    47 ;;             (when (and local-sym (not (eql symbol local-sym)))
    48 ;;               (error 'package-error (format nil "Symbol ~S already accessible in package ~S." local-sym (package-name package))))
    49 ;;             (if package-supplied-p
    50 ;;                 (%import symbol package)
    51 ;;                 (%import symbol)))
    52 ;;         (continue ()
    53 ;;           :report (lambda (s) (format s "Unintern ~S and continue" local-sym))
    54 ;;           (unintern local-sym)
    55 ;;           (%import symbol))
    56 ;;         (abort ()
    57 ;;           :report "Skip symbol")))))
     38  (dolist (symbol (if (listp symbols) symbols (list symbols)))
     39    (let* ((sym-name (string symbol))
     40           (local-sym (find-symbol sym-name package)))
     41      (restart-case
     42          (progn
     43            (when (and local-sym (not (eql symbol local-sym)))
     44              (error 'package-error (format nil "Symbol ~S already accessible in package ~S." local-sym (package-name package))))
     45            (if package-supplied-p
     46                (%import symbol package)
     47                (%import symbol)))
     48        (unintern-existing ()
     49          :report (lambda (s) (format s "Unintern ~S and continue" local-sym))
     50          (unintern local-sym)
     51          (%import symbol))
     52        (skip ()
     53          :report "Skip symbol"))))
     54  T)
Note: See TracChangeset for help on using the changeset viewer.