Commit 40b05dcb authored by pfdietz's avatar pfdietz
Browse files

Modified some tests to return more useful information on failure.

parent 66d3fa5a
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
(not (special-operator-p s)) (not (special-operator-p s))
(not (macro-function s)) (not (macro-function s))
(symbol-function s)) (symbol-function s))
always (or (null f) unless (or (null f)
(typep f 'function) (typep f 'function))
)) collect x)
t) nil)
(deftest function.5 (deftest function.5
(typep '(setf car) 'function) (typep '(setf car) 'function)
...@@ -67,12 +67,12 @@ ...@@ -67,12 +67,12 @@
;;; In ANSI CL, symbols and cons can no longer also be of type FUNCTION. ;;; In ANSI CL, symbols and cons can no longer also be of type FUNCTION.
(deftest function.10 (deftest function.10
(loop for x in *universe* (loop for x in *universe*
never when (and (or (numberp x) (characterp x)
(and (or (numberp x) (characterp x) (symbolp x) (consp x)
(symbolp x) (consp x) (typep x 'array))
(typep x 'array)) (typep x 'function))
(typep x 'function))) collect x)
t) nil)
(deftest function.11 (deftest function.11
(flet ((%f () nil)) (typep '%f 'function)) (flet ((%f () nil)) (typep '%f 'function))
......
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
(not (special-operator-p s)) (not (special-operator-p s))
(not (macro-function s)) (not (macro-function s))
(symbol-function s)) (symbol-function s))
always (or (null f) unless (or (null f)
(functionp f))) (functionp f))
t) collect x)
nil)
(deftest functionp.5 (deftest functionp.5
(functionp '(setf car)) (functionp '(setf car))
...@@ -64,12 +65,12 @@ ...@@ -64,12 +65,12 @@
;;; In ANSI CL, symbols and cons can no longer be functions ;;; In ANSI CL, symbols and cons can no longer be functions
(deftest functionp.10 (deftest functionp.10
(loop for x in *universe* (loop for x in *universe*
never when (and (or (numberp x) (characterp x)
(and (or (numberp x) (characterp x) (symbolp x) (consp x)
(symbolp x) (consp x) (typep x 'array))
(typep x 'array)) (functionp x))
(functionp x))) collect x)
t) nil)
(deftest functionp.11 (deftest functionp.11
(flet ((%f () nil)) (functionp '%f)) (flet ((%f () nil)) (functionp '%f))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment