diff --git a/ansi-tests/function.lsp b/ansi-tests/function.lsp index ed1bbe4a8889e961366aab606c1e8d3e05752382..84066c23ff250cd01ba3f7ea4bd23e89077e387c 100644 --- a/ansi-tests/function.lsp +++ b/ansi-tests/function.lsp @@ -32,10 +32,10 @@ (not (special-operator-p s)) (not (macro-function s)) (symbol-function s)) - always (or (null f) - (typep f 'function) - )) - t) + unless (or (null f) + (typep f 'function)) + collect x) + nil) (deftest function.5 (typep '(setf car) 'function) @@ -67,12 +67,12 @@ ;;; In ANSI CL, symbols and cons can no longer also be of type FUNCTION. (deftest function.10 (loop for x in *universe* - never - (and (or (numberp x) (characterp x) - (symbolp x) (consp x) - (typep x 'array)) - (typep x 'function))) - t) + when (and (or (numberp x) (characterp x) + (symbolp x) (consp x) + (typep x 'array)) + (typep x 'function)) + collect x) + nil) (deftest function.11 (flet ((%f () nil)) (typep '%f 'function)) diff --git a/ansi-tests/functionp.lsp b/ansi-tests/functionp.lsp index 1ba1446e78362662ae4c6c76715717f6f026adc4..87b51458221066b7dfe33f8d2a86db4e04335bb9 100644 --- a/ansi-tests/functionp.lsp +++ b/ansi-tests/functionp.lsp @@ -32,9 +32,10 @@ (not (special-operator-p s)) (not (macro-function s)) (symbol-function s)) - always (or (null f) - (functionp f))) - t) + unless (or (null f) + (functionp f)) + collect x) + nil) (deftest functionp.5 (functionp '(setf car)) @@ -64,12 +65,12 @@ ;;; In ANSI CL, symbols and cons can no longer be functions (deftest functionp.10 (loop for x in *universe* - never - (and (or (numberp x) (characterp x) - (symbolp x) (consp x) - (typep x 'array)) - (functionp x))) - t) + when (and (or (numberp x) (characterp x) + (symbolp x) (consp x) + (typep x 'array)) + (functionp x)) + collect x) + nil) (deftest functionp.11 (flet ((%f () nil)) (functionp '%f))