[cells-cvs] CVS update: cell-cultures/cells/cells.asd cell-cultures/cells/cells.lisp cell-cultures/cells/defpackage.lisp

[Thomas F. Burdick]

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 at 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)
   )