Update of /project/cells/cvsroot/cells In directory common-lisp.net:/tmp/cvs-serv9970 Modified Files: cell-types.lisp cells.lisp family.lisp integrity.lisp link.lisp test.lisp Log Message: Use #+(or) to reliably comment out forms Date: Mon Sep 26 17:35:58 2005 Author: ktilton Index: cells/cell-types.lisp diff -u cells/cell-types.lisp:1.6 cells/cell-types.lisp:1.7 --- cells/cell-types.lisp:1.6 Fri May 27 03:34:34 2005 +++ cells/cell-types.lisp Mon Sep 26 17:35:58 2005 @@ -39,7 +39,7 @@ md-info) (defmethod trcp ((c cell)) - nil #+not (and (typep (c-model c) 'index) + nil #+(or) (and (typep (c-model c) 'index) (eql 'state (c-slot-name c)))) (defun c-unboundp (c) @@ -89,7 +89,7 @@ (defstruct streamer from stepper donep to) -#+notyet +#+(or) (defmacro c~~~ (&key (from 0) stepper (donep (c-lambda (> .cache (streamer-to slot-c)))) @@ -114,20 +114,6 @@ ;;; (print `(assume doing ,slot-value)) ;;; (call-next-method c slot-value)))) ;;; (c-optimize-away?! c)) - -#+test -(progn - (defmodel streamertest () - ((val :accessor val :initform (c~~~ :from 0 :to (^oval))) - (oval :initarg :oval :accessor oval :initform (c-in 0)))) - - (def-c-output val ((self streamertest)) - (print `(streamertest old ,old-value new ,new-value))) - - (cell-reset) - (let ((it (make-be 'streamertest :oval 5))) - ;;(setf (oval it) 5) - it)) (defstruct (c-drifter (:include c-dependent))) Index: cells/cells.lisp diff -u cells/cells.lisp:1.5 cells/cells.lisp:1.6 --- cells/cells.lisp:1.5 Fri Aug 26 16:28:00 2005 +++ cells/cells.lisp Mon Sep 26 17:35:58 2005 @@ -58,7 +58,7 @@ (defmacro c-assert (assertion &optional places fmt$ &rest fmt-args) (declare (ignorable assertion places fmt$ fmt-args)) - `(progn) #+not + `(progn) #+(or) `(unless *stop* (unless ,assertion ,(if fmt$ Index: cells/family.lisp diff -u cells/family.lisp:1.2 cells/family.lisp:1.3 --- cells/family.lisp:1.2 Wed May 18 23:47:29 2005 +++ cells/family.lisp Mon Sep 26 17:35:58 2005 @@ -159,7 +159,7 @@ (c-assert (not (member nil new-kids))) (trc nil "md-kids-change > entry" usage new-kids old-kids) - #+not (when (and (trcp self) + #+(or) (when (and (trcp self) (eql usage :mdslotvalueassume)) (c-break "how here? ~a" self)) Index: cells/integrity.lisp diff -u cells/integrity.lisp:1.3 cells/integrity.lisp:1.4 --- cells/integrity.lisp:1.3 Wed May 18 23:47:29 2005 +++ cells/integrity.lisp Mon Sep 26 17:35:58 2005 @@ -85,7 +85,7 @@ (ufb-add opcode (cons (cdr defer-info) action)) (when (and (not *deference-acknowledged*) (member opcode '(:setf :makunbound))) - #+not (error 'c-opcode-deferred + #+(or) (error 'c-opcode-deferred :defer-info defer-info) (trc nil "!!! New pulse, event" *data-pulse-id* defer-info))) (funcall action)) Index: cells/link.lisp diff -u cells/link.lisp:1.6 cells/link.lisp:1.7 --- cells/link.lisp:1.6 Fri May 27 03:34:34 2005 +++ cells/link.lisp Mon Sep 26 17:35:58 2005 @@ -22,7 +22,7 @@ (in-package :cells) -#+not +#+(or) (eval-when (compile load) (proclaim '(optimize (speed 3) (safety 0) (space 0) (debug 0)))) Index: cells/test.lisp diff -u cells/test.lisp:1.6 cells/test.lisp:1.7 --- cells/test.lisp:1.6 Fri May 27 03:34:34 2005 +++ cells/test.lisp Mon Sep 26 17:35:58 2005 @@ -108,21 +108,6 @@ (kids i))) (trc "index total" (md-value i)))) -#+test -(let* ((a (make-array 16 :element-type 'bit - ;;:adjustable t - :initial-element 0)) - (asz (array-dimension a 0))) - (DESCRIBE A) - (inspect a) - (print a) - (dotimes (n 20) - (print n) - #+not (unless (< n asz) - (adjust-array a (incf asz 16) :initial-element 0)) - (setf (sbit a n) 1)) - a) - (defmodel m-null () ((aa :initform nil :cell nil :initarg :aa :accessor aa)))