diff --git a/ansi-tests/packages-09.lsp b/ansi-tests/packages-09.lsp index dfbfdf2efd409fa9fdb079d2eba4af26b955e249..96cf565500574260e35f1769984004da5e721d4e 100644 --- a/ansi-tests/packages-09.lsp +++ b/ansi-tests/packages-09.lsp @@ -267,8 +267,8 @@ (handler-case (make-package "A") (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -277,8 +277,8 @@ (handler-case (make-package "Q") (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -288,8 +288,8 @@ (progn (ignore-errors (delete-package "TEST1")) (make-package "TEST1" :nicknames '("A"))) (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) @@ -299,8 +299,8 @@ (progn (ignore-errors (delete-package "TEST1")) (make-package "TEST1" :nicknames '("Q"))) (error (c) - (if (member 'abort (mapcar #'restart-name (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'failure))) success) diff --git a/ansi-tests/packages-16.lsp b/ansi-tests/packages-16.lsp index b3eee37d56cb70df2ee0dfad07a32b988a651c1c..2000fd6fd5717accb9e653bbe07f5e35bf2edf42 100644 --- a/ansi-tests/packages-16.lsp +++ b/ansi-tests/packages-16.lsp @@ -471,7 +471,7 @@ program-error) ;; Names given to :export and :intern must be disjoint, -;; otherwise signal a package-error +;; otherwise signal a program-error (deftest defpackage-23 (ignore-errors (ignore-errors (delete-package "H")) @@ -493,9 +493,8 @@ (handler-case (eval '(defpackage "H" (:shadowing-import-from "G" "NOT-THERE"))) (package-error (c) - (if (member 'abort (mapcar #'restart-name - (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'fail)) (error (c) c))) @@ -512,9 +511,8 @@ (handler-case (eval '(defpackage "H" (:import-from "G" "NOT-THERE"))) (package-error (c) - (if (member 'abort (mapcar #'restart-name - (compute-restarts c)) - :test (complement #'eq)) + (if (position 'abort (compute-restarts c) + :key #'restart-name :test-not #'eq) 'success 'fail)) (error (c) c)))