Update of /project/cells/cvsroot/cells/cells-test In directory common-lisp.net:/tmp/cvs-serv9970/cells-test
Modified Files: boiler-examples.lisp echo-setf.lisp hello-world-q.lisp hello-world.lisp internal-combustion.lisp lazy-propagation.lisp output-setf.lisp person.lisp test-family.lisp test-lazy.lisp test.lisp Log Message: Use #+(or) to reliably comment out forms Date: Mon Sep 26 17:36:00 2005 Author: ktilton
Index: cells/cells-test/boiler-examples.lisp diff -u cells/cells-test/boiler-examples.lisp:1.1 cells/cells-test/boiler-examples.lisp:1.2 --- cells/cells-test/boiler-examples.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/boiler-examples.lisp Mon Sep 26 17:36:00 2005 @@ -60,7 +60,7 @@ (cv-assert (eql :closed (vent b))) ))
-#+test +#+(or) (boiler-1)
; @@ -157,7 +157,7 @@ (cv-assert (eql :closed (vent b))) ))
-#+test +#+(or) (boiler-2)
;;; *********************************************** @@ -242,10 +242,10 @@ ;; ;; de-comment 'trc statements above to see what is happening ;; -#+test +#+(or) (boiler-3)
-#+test +#+(or) (boiler-4)
(defun boiler-5 () @@ -267,7 +267,7 @@ (incf (temp (thermometer b)))) (setf (status b) (case (status b) (:on :off)(:off :on))))))
-#+test +#+(or)
(boiler-5)
@@ -287,4 +287,4 @@ (declare (ignorable syn)) (eko ("f-sensitivity relays") (setf prior-fire-value new-value)) ;; no modulation of value, but do record for next time - ))) \ No newline at end of file + )))
Index: cells/cells-test/echo-setf.lisp diff -u cells/cells-test/echo-setf.lisp:1.1 cells/cells-test/echo-setf.lisp:1.2 --- cells/cells-test/echo-setf.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/echo-setf.lisp Mon Sep 26 17:36:00 2005 @@ -43,5 +43,5 @@ :kids (c-in nil)))) (push (make-instance 'bings) (kids top))))
-#+test -(cv-echo-setf) \ No newline at end of file +#+(or) +(cv-echo-setf)
Index: cells/cells-test/hello-world-q.lisp diff -u cells/cells-test/hello-world-q.lisp:1.1 cells/cells-test/hello-world-q.lisp:1.2 --- cells/cells-test/hello-world-q.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/hello-world-q.lisp Mon Sep 26 17:36:00 2005 @@ -58,10 +58,10 @@ (setf (happen dell) :world) (values)))
-#+test +#+(or) (hello-world)
-#+test +#+(or) (traceo sm-echo)
Index: cells/cells-test/hello-world.lisp diff -u cells/cells-test/hello-world.lisp:1.1 cells/cells-test/hello-world.lisp:1.2 --- cells/cells-test/hello-world.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/hello-world.lisp Mon Sep 26 17:36:00 2005 @@ -58,7 +58,7 @@ (setf (happen dell) :world) (values)))
-#+test +#+(or) (hello-world)
Index: cells/cells-test/internal-combustion.lisp diff -u cells/cells-test/internal-combustion.lisp:1.2 cells/cells-test/internal-combustion.lisp:1.3 --- cells/cells-test/internal-combustion.lisp:1.2 Fri Aug 26 16:27:59 2005 +++ cells/cells-test/internal-combustion.lisp Mon Sep 26 17:36:00 2005 @@ -100,7 +100,7 @@ (eql :diesel (setf (fuel (make-be 'engine :fuel :gas)) :diesel))) ;; ;; - #+noterror ;; Cloucell needed to hold a Cell in a non cellular slot. duh. + #+(or)error ;; Cloucell needed to hold a Cell in a non cellular slot. duh. (cv-assert (handler-case (progn @@ -246,7 +246,7 @@ ;;
;; - #+not (let ((e (make-be 'engine + #+(or) (let ((e (make-be 'engine :mod3 (c-in 3) :mod3ek (c-in 3) :cylinders (c? (* 4 (mod3 self)))))) @@ -357,6 +357,6 @@ (cv-assert (not valves-fired)) (cv-assert (valves e))(cv-assert valves-fired)))
-#+test +#+(or)
-(cv-test-engine) \ No newline at end of file +(cv-test-engine)
Index: cells/cells-test/lazy-propagation.lisp diff -u cells/cells-test/lazy-propagation.lisp:1.1 cells/cells-test/lazy-propagation.lisp:1.2 --- cells/cells-test/lazy-propagation.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/lazy-propagation.lisp Mon Sep 26 17:36:00 2005 @@ -35,7 +35,7 @@ (/ 1000 (^area))) :initarg :density :accessor density)))
-#+test +#+(or) (cv-laziness)
(defun cv-laziness () @@ -73,7 +73,7 @@ (chk 4 1) it))))
-#+test +#+(or) (cv-laziness)
(def-c-output area ()
Index: cells/cells-test/output-setf.lisp diff -u cells/cells-test/output-setf.lisp:1.1 cells/cells-test/output-setf.lisp:1.2 --- cells/cells-test/output-setf.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/output-setf.lisp Mon Sep 26 17:36:00 2005 @@ -32,7 +32,7 @@ (bwhen (p .parent) (with-deference (setf (bang p) new-value))) - #+not (dolist (k (^kids)) + #+(or) (dolist (k (^kids)) (setf (bang k) (if (numberp new-value) (1+ new-value) 0)))) @@ -53,5 +53,5 @@ (dolist (k (kids (car (kids top)))) (setf (bang k) (kid-no k)))))
-#+test +#+(or) (cv-output-setf)
Index: cells/cells-test/person.lisp diff -u cells/cells-test/person.lisp:1.1 cells/cells-test/person.lisp:1.2 --- cells/cells-test/person.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/person.lisp Mon Sep 26 17:36:00 2005 @@ -286,7 +286,7 @@
(trc "start guarded cyclic")
- #+not (cv-assert-error + #+(or) (cv-assert-error (let ((tk (make-be 'talker))) (setf (idea tk) "yes") (cv-assert (string-equal "yes" (words tk))) @@ -298,9 +298,9 @@ ;; is being given the same value it already has, and propagation stops. ;; (make-be 'talker8) - #+not (let ((tk (make-be 'talker8))) + #+(or) (let ((tk (make-be 'talker8))) (setf (idea8 tk) "yes") (string-equal "yes" (words8 tk)) (setf (words8 tk) "no") (string-equal "no" (idea8 tk))) - ) \ No newline at end of file + )
Index: cells/cells-test/test-family.lisp diff -u cells/cells-test/test-family.lisp:1.1 cells/cells-test/test-family.lisp:1.2 --- cells/cells-test/test-family.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/test-family.lisp Mon Sep 26 17:36:00 2005 @@ -83,7 +83,7 @@ (pop (kids mom)) (nat-age 40))))
-#+test +#+(or)
(cv-test-family)
@@ -119,7 +119,7 @@ (defmodel bottle (model) ((label :initarg :label :initform "unlabeled" :accessor label)))
-#+test +#+(or) (cv-family-values)
(defun cv-family-values () @@ -154,5 +154,5 @@
))
-#+test -(cv-family-values) \ No newline at end of file +#+(or) +(cv-family-values)
Index: cells/cells-test/test-lazy.lisp diff -u cells/cells-test/test-lazy.lisp:1.1 cells/cells-test/test-lazy.lisp:1.2 --- cells/cells-test/test-lazy.lisp:1.1 Fri May 6 23:05:51 2005 +++ cells/cells-test/test-lazy.lisp Mon Sep 26 17:36:00 2005 @@ -116,4 +116,4 @@ (unbound-error-p (md-slot-makunbound self 'val2)))) 2 nil nil)
-#+test (do-tests) \ No newline at end of file +#+(or) (do-tests)
Index: cells/cells-test/test.lisp diff -u cells/cells-test/test.lisp:1.2 cells/cells-test/test.lisp:1.3 --- cells/cells-test/test.lisp:1.2 Fri Aug 26 16:27:59 2005 +++ cells/cells-test/test.lisp Mon Sep 26 17:36:00 2005 @@ -74,7 +74,7 @@ (cv-test-lazy))))
-#+test +#+(or) (progn (let ((*c-debug* t)) (cell-reset)