diff --git a/ansi-tests/cons-test-07.lsp b/ansi-tests/cons-test-07.lsp index e4170a1959aa6b4501c728059911a97a8f7f429c..b9ffae3cf70a80849cc42ba6bf232136810f8a54 100644 --- a/ansi-tests/cons-test-07.lsp +++ b/ansi-tests/cons-test-07.lsp @@ -139,17 +139,14 @@ ;;; nreconc (deftest nreconc-1 - (let* ((x (list 'a 'b 'c)) - (y (nreverse (loop for e on x collect e)))) - (setf x (nreconc x (copy-tree '(d e f)))) - (and (eq x (car y)) - (eq (cdr x) (cadr y)) - (eq (cddr x) (caddr y)) - x)) + (let* ((x (list 'a 'b 'c)) + (y (copy-tree '(d e f))) + (result (nreconc x y))) + (and (equal y '(d e f)) + result)) (c b a d e f)) (deftest nreconc-2 - (handler-case - (nreconc nil 'a) - (error (c) c)) + (nreconc nil 'a) a) + diff --git a/ansi-tests/flet.lsp b/ansi-tests/flet.lsp index 44bac4d52b9a5ee45f6bfb83b3da700965b51ca9..ec6199ae703ae13cd3ec3feb91052785f7524845 100644 --- a/ansi-tests/flet.lsp +++ b/ansi-tests/flet.lsp @@ -105,7 +105,7 @@ ;;; Definition of a (setf ...) function (deftest flet.17 - (flet (((setf %f) (x y) (setf (car x) y))) + (flet (((setf %f) (x y) (setf (car y) x))) (let ((z (list 1 2))) (setf (%f z) 'a) z)) diff --git a/ansi-tests/functionp.lsp b/ansi-tests/functionp.lsp index 4b4505fe9e8124fa52de4c659d60b481f9f96610..afa394b3278915719385175f2a706339970e9075 100644 --- a/ansi-tests/functionp.lsp +++ b/ansi-tests/functionp.lsp @@ -26,7 +26,9 @@ (deftest functionp.4 (loop for x in *cl-symbol-names* for s = (find-symbol x "CL") - for f = (and (fboundp s) (symbol-function s)) + for f = (and (fboundp s) (symbol-function s) + (not (special-operator-p s)) + (not (macro-function s))) always (or (null f) (functionp f))) t) diff --git a/ansi-tests/labels.lsp b/ansi-tests/labels.lsp index 595df93b747083b64b39b89ba9d6d3a8689b8b11..fe1c67c18821b01d2c48dd8bbf15e2c441c2a31a 100644 --- a/ansi-tests/labels.lsp +++ b/ansi-tests/labels.lsp @@ -104,7 +104,7 @@ ;;; Definition of a (setf ...) function (deftest labels.17 - (labels (((setf %f) (x y) (setf (car x) y))) + (labels (((setf %f) (x y) (setf (car y) x))) (let ((z (list 1 2))) (setf (%f z) 'a) z))