June 2004 - cells-cvs@common-lisp.net - mailman3.common-lisp.net

[cells-cvs] CVS update: cell-cultures/cells/defpackage.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv10030/cells Modified Files: defpackage.lisp Log Message: Date: Wed Jun 30 14:02:47 2004 Author: tburdick Index: cell-cultures/cells/defpackage.lisp diff -u cell-cultures/cells/defpackage.lisp:1.2 cell-cultures/cells/defpackage.lisp:1.3 --- cell-cultures/cells/defpackage.lisp:1.2 Tue Jun 29 01:58:49 2004 +++ cell-cultures/cells/defpackage.lisp Wed Jun 30 14:02:47 2004 @@ -23,17 +23,22 @@ (in-package :common-lisp-user) (defpackage :cells - (:use #:common-lisp - #:utils-kt - #+allegro #:excl - #-(or cormanlisp cmu sbcl) #:clos - #+sbcl #:sb-mop + (:use #:common-lisp #:utils-kt) + (:import-from + ;; MOP + #+allegro #:excl + #+clisp #:clos + #+cmu #:mop + #+lispworks #:clos #+mcl #:ccl + #+sbcl #:sb-mop + #-(or allegro clisp cmu lispworks mcl sbcl) + (cerror "Provide a package name." + "Don't know how to find the MOP package for this Lisp.") + + #:class-precedence-list #:class-slots #:slot-definition-name ) - #+clisp (:import-from #:clos #:class-slots #:class-precedence-list) - #+cmu (:import-from #:pcl #:class-precedence-list #:class-slots - #:slot-definition-name #:true) - #+lispworks (:import-from #:lw #:true) + (:export #:cell #:c-input #:c-in #:c-in8 #:c? #:c?8 #:c?_ #:c?? #:with-integrity #:with-deference #:without-c-dependency #:self #:.cache #:c-lambda #:.cause @@ -49,4 +54,3 @@ ) #+allegro (:shadowing-import-from #:excl #:fasl-write #:fasl-read #:gc) ) -

1 0

[cells-cvs] CVS update: cell-cultures/asdf-aclproj/asdf-aclproj.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/asdf-aclproj In directory common-lisp.net:/tmp/cvs-serv10030/asdf-aclproj Modified Files: asdf-aclproj.lisp Log Message: Date: Wed Jun 30 14:02:47 2004 Author: tburdick Index: cell-cultures/asdf-aclproj/asdf-aclproj.lisp diff -u cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.2 --- cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 Tue Jun 29 01:58:48 2004 +++ cell-cultures/asdf-aclproj/asdf-aclproj.lisp Wed Jun 30 14:02:47 2004 @@ -48,12 +48,6 @@ (defmethod asdf:module-components ((project lpr-project-file)) (project-modules project)) -#+(or) -(defmethod asdf:perform :before (operation (project lpr-project-file)) - (unless (asdf:module-components project) - (setf (asdf:module-components project) - (project-modules project)))) - ;;;; For use in .lpr files (defclass lpr-component () ()) @@ -61,8 +55,9 @@ (defclass project-module (lpr-component lpr-project-file) ()) ;; Because we allow goofy names like ../foo/bar.lisp, we want to return the -;; truename of the pathname, if it exists, so children will be merged -;; correctly. +;; truename of the pathname, if it exists, so children will be merged correctly. +;; I think this is a workaround for a bug in SBCL's pathname merging, but the +;; bug could be in my understanding of CL pathnames -tfb (defmethod asdf:component-pathname ((component lpr-component)) (let ((path (call-next-method))) (or (probe-file path) path))) @@ -125,8 +120,8 @@ (apply #'call-next-method component args))) (defun ensure-cgu-package () - #+(and acl mswindows) - (progn (aclwin-warning) (return-from ensure-cgu-package)) + #+(and acl mswindows) (progn (aclwin-warning) + (return-from ensure-cgu-package)) (unless (find-package "COMMON-GRAPHICS-USER") (let ((user-package (find-package "ASDF-ACLPROJ-USER"))) (assert (not (null user-package))) @@ -162,7 +157,8 @@ for depends-on = (reverse so-far) do (setf (slot-value component 'asdf::in-order-to) `((asdf:load-op (asdf:load-op ,@depends-on)) - (asdf:compile-op (asdf:compile-op ,@depends-on)))) + (asdf:compile-op (asdf:load-op ,@depends-on) + (asdf:compile-op ,@depends-on)))) (push component so-far) finally (return (reverse so-far))))) (setf *project-modules*

1 0

[cells-cvs] CVS update: cell-cultures/utils-kt/defpackage.lisp
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/utils-kt In directory common-lisp.net:/tmp/cvs-serv7072/utils-kt Modified Files: defpackage.lisp Log Message: Date: Wed Jun 30 14:02:12 2004 Author: tburdick Index: cell-cultures/utils-kt/defpackage.lisp diff -u cell-cultures/utils-kt/defpackage.lisp:1.2 cell-cultures/utils-kt/defpackage.lisp:1.3 --- cell-cultures/utils-kt/defpackage.lisp:1.2 Tue Jun 29 01:58:49 2004 +++ cell-cultures/utils-kt/defpackage.lisp Wed Jun 30 14:02:12 2004 @@ -20,16 +20,13 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. +(in-package :cl-user) + (defpackage :utils-kt - (:use #:common-lisp - #-(or cormanlisp cmu sbcl) #:clos - #+sbcl #:sb-mop - #+mcl #:ccl) + (:use #:common-lisp) (:export #:eko #:eko-if #:count-it #:trc #:maptimes #:bwhen #:bif #:xor "WITH-DYNAMIC-FN" #:last1 #:packed-flat! #:with-metrics "TRUE" "SHORTC" #:intern$ #:defconstant-once "*COUNT*" "*STOP*" "*DBG*" "*TRCDEPTH*" #:make-fifo-queue #:fifo-add #:fifo-empty #:fifo-pop #:mapfifo)) - -(in-package :utils-kt)

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test.asd
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv19449/cells Modified Files: cells-test.asd Log Message: Fixes from porting to CMUCL: * Fixed a serialization bug in asdf-aclproj. * Cleaned up defpackage forms. * Loading cells-test with asdf now runs the tests in an :after method. Date: Wed Jun 30 13:56:36 2004 Author: tburdick Index: cell-cultures/cells/cells-test.asd diff -u cell-cultures/cells/cells-test.asd:1.1 cell-cultures/cells/cells-test.asd:1.2 --- cell-cultures/cells/cells-test.asd:1.1 Tue Jun 29 18:08:33 2004 +++ cell-cultures/cells/cells-test.asd Wed Jun 30 13:56:36 2004 @@ -18,3 +18,6 @@ :long-description "Informatively-commented regression tests for Cells" :serial t :components ((lpr-project-file "cells-test"))) + +(defmethod perform :after ((op load-op) (system (eql (find-system :cells-test)))) + (cells::cv-test)) \ No newline at end of file

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test/cells-test.asd
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells/cells-test In directory common-lisp.net:/tmp/cvs-serv26932/cells/cells-test Removed Files: cells-test.asd Log Message: Moved some things around, added installation instructions. Date: Tue Jun 29 18:08:33 2004 Author: tburdick

1 0

[cells-cvs] CVS update: cell-cultures/README cell-cultures/README-ASDF
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures In directory common-lisp.net:/tmp/cvs-serv26932 Added Files: README README-ASDF Log Message: Moved some things around, added installation instructions. Date: Tue Jun 29 18:08:33 2004 Author: tburdick

1 0

[cells-cvs] CVS update: cell-cultures/asdf-registry/create-symlinks.sh
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/asdf-registry In directory common-lisp.net:/tmp/cvs-serv26932/asdf-registry Added Files: create-symlinks.sh Log Message: Moved some things around, added installation instructions. Date: Tue Jun 29 18:08:33 2004 Author: tburdick

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test.asd
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv26932/cells Added Files: cells-test.asd Log Message: Moved some things around, added installation instructions. Date: Tue Jun 29 18:08:33 2004 Author: tburdick

1 0

[cells-cvs] CVS update: Directory change: cell-cultures/asdf-registry
by Thomas F. Burdick 30 Jun '04

30 Jun '04

Update of /project/cells/cvsroot/cell-cultures/asdf-registry In directory common-lisp.net:/tmp/cvs-serv10152/asdf-registry Log Message: Directory /project/cells/cvsroot/cell-cultures/asdf-registry added to the repository Date: Tue Jun 29 17:58:36 2004 Author: tburdick New directory cell-cultures/asdf-registry added

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells.asd cell-cultures/cells/cells.lisp cell-cultures/cells/defpackage.lisp
by Thomas F. Burdick 29 Jun '04

29 Jun '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv14176/cells Modified Files: cells.asd cells.lisp defpackage.lisp Log Message: Added asdf<->lpr glue, and fixed ACL-produced nonsense like defpackage forms for the common-lisp package (I'm guessing ACL ignores these). Date: Tue Jun 29 01:58:49 2004 Author: tburdick Index: cell-cultures/cells/cells.asd diff -u cell-cultures/cells/cells.asd:1.1 cell-cultures/cells/cells.asd:1.2 --- cell-cultures/cells/cells.asd:1.1 Sat Jun 26 11:38:36 2004 +++ cell-cultures/cells/cells.asd Tue Jun 29 01:58:49 2004 @@ -3,10 +3,12 @@ ;(declaim (optimize (debug 2) (speed 1) (safety 1) (compilation-speed 1))) (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(operate 'load-op :asdf-aclproj) +(use-package :asdf-aclproj) #+(or allegro lispworks cmu mcl clisp cormanlisp sbcl scl) -(asdf:defsystem :cells +(defsystem :cells :name "cells" :author "Kenny Tilton <ktilton(a)nyc.rr.com>" :version "05-Nov-2003" @@ -14,33 +16,8 @@ :licence "MIT Style" :description "Cells" :long-description "The Cells dataflow extension to CLOS." - :serial t - :components - ((:file "cells") - (:file "debug") - (:file "flow-control") - (:file "strings") - (:file "detritus") - (:file "cell-types") - (:file "integrity") - (:file "constructors") - (:file "initialize") - (:file "md-slot-value") - (:file "slot-utilities") - (:file "optimization") - (:file "link") - (:file "propagate") - (:file "synapse") - (:file "synapse-types") - (:file "model-object") - (:file "defmodel") - (:file "md-utilities") - (:file "family") - (:file "fm-utilities") - (:file "family-values") - (:file "quad") - (:file "test"))) + :components ((lpr-project-file "cells"))) -(defmethod asdf:perform ((o load-op) (c (eql (find-system :cells)))) - (pushnew "CELLS" *modules*) - (pushnew :cells *features*)) \ No newline at end of file +(defmethod perform ((o load-op) (c (eql (find-system :cells)))) + ; (pushnew "CELLS" *modules* :test #'string=) + (pushnew :cells *features*)) Index: cell-cultures/cells/cells.lisp diff -u cell-cultures/cells/cells.lisp:1.1 cell-cultures/cells/cells.lisp:1.2 --- cell-cultures/cells/cells.lisp:1.1 Sat Jun 26 11:38:36 2004 +++ cell-cultures/cells/cells.lisp Tue Jun 29 01:58:49 2004 @@ -26,34 +26,6 @@ (eval-when (compile load) (proclaim '(optimize (speed 2) (safety 3) (space 1) (debug 3)))) -(defpackage :cells - (:use "COMMON-LISP" - #+allegro "EXCL" - #-(or cormanlisp cmu sbcl) "CLOS" - #+sbcl "SB-MOP" - #+mcl "CCL" - ) - #+clisp (:import-from #:clos "CLASS-SLOTS" "CLASS-PRECEDENCE-LIST") - #+cmu (:import-from "PCL" "CLASS-PRECEDENCE-LIST" "CLASS-SLOTS" - "SLOT-DEFINITION-NAME" "TRUE") - #+lispworks (:import-from "LW" "TRUE") - (:export "CELL" "C-INPUT" #:c-in #:c-in8 "C?" #:c?8 "C?_" "C??" - #:with-integrity #:with-deference "WITHOUT-C-DEPENDENCY" "SELF" - ".CACHE" "C-LAMBDA" ".CAUSE" - "DEFMODEL" "C-AWAKEN" "DEF-C-OUTPUT" "DEF-C-UNCHANGED-TEST" - "NEW-VALUE" "OLD-VALUE" "C..." - #:make-be - "MKPART" "THE-KIDS" "NSIB" "MD-VALUE" "^MD-VALUE" ".MD-VALUE" "KIDS" "^KIDS" ".KIDS" - "CELL-RESET" "UPPER" "FM-MAX" "NEAREST" "FM-MIN-KID" "FM-MAX-KID" "MK-KID-SLOT" - "DEF-KID-SLOTS" "FIND-PRIOR" "FM-POS" "KID-NO" "FM-INCLUDES" "FM-ASCENDANT-COMMON" - "FM-KID-CONTAINING" "FM-FIND-IF" "FM-ASCENDANT-IF" "C-ABS" "FM-COLLECT-IF" "PSIB" - "TO-BE" "NOT-TO-BE" "SSIBNO" "MD-AWAKEN" - #:c-debug "C-BREAK" "C-ASSERT" "C-STOP" "C-STOPPED" "C-ASSERT" ".STOP" - #:delta-diff - ) - #+allegro (:shadowing-import-from #:excl #:fasl-write #:fasl-read #:gc) - ) - (in-package :cells) (defconstant *c-optimizep* t) Index: cell-cultures/cells/defpackage.lisp diff -u cell-cultures/cells/defpackage.lisp:1.1 cell-cultures/cells/defpackage.lisp:1.2 --- cell-cultures/cells/defpackage.lisp:1.1 Sat Jun 26 11:38:36 2004 +++ cell-cultures/cells/defpackage.lisp Tue Jun 29 01:58:49 2004 @@ -20,7 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -(in-package :common-lisp) +(in-package :common-lisp-user) (defpackage :cells (:use #:common-lisp @@ -45,8 +45,7 @@ #:def-kid-slots #:find-prior #:fm-pos #:kid-no #:fm-includes #:fm-ascendant-common #:fm-kid-containing #:fm-find-if #:fm-ascendant-if #:c-abs #:fm-collect-if #:psib #:to-be #:not-to-be #:ssibno #:md-awaken - #:c-debug #:c-break #:c-assert #:c-stop #:c-stopped #:c-assert #:.stop - #:delta-diff + #:c-debug #:c-break #:c-assert #:c-stop #:c-stopped #:c-assert #:.stop #:delta-diff ) #+allegro (:shadowing-import-from #:excl #:fasl-write #:fasl-read #:gc) )

1 0