X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Feval.impure.lisp;h=5989e51e5979f30c0dc2641d69184b65fae707a9;hb=f7eea1a2ca55773f76c2ae523f880b1d751554e7;hp=6b22474a14be396dd74188bcb7959f972f30b64f;hpb=4099112d8e4687f266922f0e044fba8f17dddcf6;p=sbcl.git

diff --git a/tests/eval.impure.lisp b/tests/eval.impure.lisp
index 6b22474..5989e51 100644
--- a/tests/eval.impure.lisp
+++ b/tests/eval.impure.lisp
@@ -6,7 +6,7 @@
 ;;;; While most of SBCL is derived from the CMU CL system, the test
 ;;;; files (like this one) were written from scratch after the fork
 ;;;; from CMU CL.
-;;;; 
+;;;;
 ;;;; This software is in the public domain and is provided with
 ;;;; absolutely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
@@ -100,6 +100,58 @@
 (assert (constantp (find-class 'symbol)))
 (assert (constantp #p""))
 
+;;; More CONSTANTP tests
+;;;              form                   constantp sb-int:constant-form-value
+(dolist (test '((t                      t         t)
+                (x                      nil)
+                ('x                     t         x)
+                (:keyword               t         :keyword)
+                (42                     t         42)
+                ((if t :ok x)           t         :ok)
+                ((if t x :no)           nil)
+                ((progn
+                   (error "oops")
+                   t)                   nil)
+                ((progn 1 2 3)          t         3)
+                ((block foo :good)      t         :good)
+                ((block foo
+                   (return-from foo t)) nil)
+                ((progv
+                     (list (gensym))
+                     '(1)
+                   (+ 1))               nil)
+                ((progv
+                     '(x)
+                     (list (random 2))
+                   x)                   nil)
+                ((progv
+                     '(x)
+                     '(1)
+                   (1+ x))              t         2)
+                ((progv '(x) '(t)
+                   (if x 1 2))          t         1)
+                ((unwind-protect 1 nil) t         1)
+                ((unwind-protect 1
+                   (xxx))               nil)
+                ((the integer 1)        t         1)
+                ((the integer (+ 1 1))  t         2)
+                ((the integer (foo))    nil)
+                ((the symbol 1)         nil)
+                ((the "bad type" 1)     nil)
+                ((multiple-value-prog1
+                     (+ 1 1)
+                   :nada)               t         2)
+                ((multiple-value-prog1
+                     :nada
+                   (/ 1 0))             nil)
+                ((/ 1 0)                nil)
+                ((/ 1 1)                t         1)
+                ((+ 1 2)                t         3)))
+  (destructuring-bind (form c &optional v) test
+    (assert (eql (constantp form) c))
+    (when c
+      (assert (eql v (sb-int:constant-form-value form))))))
+
 ;;; DEFPARAMETER must assign a dynamic variable
 (let ((var (gensym)))
   (assert (equal (eval `(list (let ((,var 1))
@@ -133,8 +185,16 @@
 
 ;;; No extra output, please
 (assert (equal ".."
-	       (with-output-to-string (*standard-output*)
-		 (eval '(progn (princ ".") (let ((x 42)) t) (princ "."))))))
+               (with-output-to-string (*standard-output*)
+                 (eval '(progn (princ ".") (let ((x 42)) t) (princ "."))))))
+
+;;; IF
+(defun true () t)
+(defun false () nil)
+(defmacro oops () (throw :oops (list)))
+(defun test-eval (ok form) (assert (eq ok (catch :oops (eval form)))))
+(test-eval t '(if (false) (oops) t))
+(test-eval t '(if (true) t (oops)))
+(test-eval nil '(if (not (if (false) t)) (oops)))
 
 ;;; success
-(sb-ext:quit :unix-status 104)