move space back to csys - has nothing to do with shape, is mostly csys-specific

csys/environ.lisp

@@ -6,7 +6,7 @@
                     (:csys :scopes/csys)
                     (:message :scopes/core/message)
                     (:shape :scopes/shape)
-                    (:space :scopes/shape/space)
+                    (:space :scopes/csys/space)
                     (:util :scopes/util))
   (:export #:*env*
            #:create #:simple-setup #:simple-proc

csys/space.lisp

@@ -1,12 +1,12 @@
-;;;; cl-scopes/shape/space
+;;;; cl-scopes/csys/space
 ;;;; definitions for (spatial) registering and retrieving objects by location
 
-(defpackage :scopes/shape/space
+(defpackage :scopes/csys/space
   (:use :common-lisp)
   (:local-nicknames (:alx :alexandria))
   (:export #:create #:put #:fetch #:query))
 
-(in-package :scopes/shape/space)
+(in-package :scopes/csys/space)
 
 (defun create ()
   (make-hash-table :test #'equalp))

scopes-core.asd

@@ -21,7 +21,6 @@
                (:file "forge/forge" :depends-on ("util/iter" "util/util"))
                (:file "logging" :depends-on ("config" "util/util"))
                (:file "shape/shape")
-               (:file "shape/space")
                (:file "util/util")
                (:file "util/async" :depends-on ("util/util"))
                (:file "util/crypt" :depends-on ("util/util"))

scopes-csys.asd

@@ -10,8 +10,9 @@
   :description "Concurrent cybernetic communications systems."
   :depends-on (:scopes-core)
   :components  ((:file "csys/csys")
-                (:file "csys/environ" :depends-on ("csys/csys"))
+                (:file "csys/environ" :depends-on ("csys/csys" "csys/space"))
-                (:file "csys/program/basic" :depends-on ("csys/csys" "csys/environ")))
+                (:file "csys/program/basic" :depends-on ("csys/csys" "csys/environ"))
+                (:file "csys/space"))
   :long-description "scopes/csys: Concurrent cybernetic communication systems."
   :in-order-to  ((test-op (test-op "scopes-csys/test"))))
 

test/test-core.lisp

@@ -13,7 +13,6 @@
                     (:logging :scopes/logging)
                     (:message :scopes/core/message)
                     (:shape :scopes/shape)
-                    (:space :scopes/shape/space)
                     (:util :scopes/util)
                     (:t :scopes/testing))
   (:export #:run #:user #:password
@@ -70,7 +69,6 @@
         (test-util-crypt)
         (test-util-iter)
         (test-shape)
-        (test-space)
         (core:setup-services)
         (test-util-async)
         (test-actor)
@@ -132,15 +130,6 @@
     (== (shape:head-plist-str rec) '(:taskid "t1" :username "u1"))
 ))
 
-(deftest test-space ()
-  (let ((idx (space:create)))
-    (space:put idx #(1 1) 42)
-    (space:put idx #(1 2) 46)
-    (space:put idx #(1 1) 43)
-    (== (space:fetch idx #(1 1)) 43)
-    (== (space:fetch idx #(1 2)) 46)
-    ))
- 
 (deftest test-util-async ()
   (let ((mb (async:make-task nil)))
     (async:submit-task mb (lambda () (sleep 0.1) :done))

test/test-csys.lisp

@@ -13,6 +13,7 @@
                     (:logging :scopes/logging)
                     (:message :scopes/core/message)
                     (:shape :scopes/shape)
+                    (:space :scopes/csys/space)
                     (:util :scopes/util)
                     (:t :scopes/testing)
                     (:tc :scopes/test-core))
@@ -49,6 +50,7 @@
     (load (t:test-path "config-csys" "etc"))
     (async:init)
     (unwind-protect
+      (test-space)
       (test-basic-0)
       (test-basic-1)
       (test-basic-2)
@@ -75,6 +77,15 @@
 
 ;;;; test definitions
 
+ (deftest test-space ()
+  (let ((idx (space:create)))
+    (space:put idx #(1 1) 42)
+    (space:put idx #(1 2) 46)
+    (space:put idx #(1 1) 43)
+    (== (space:fetch idx #(1 1)) 43)
+    (== (space:fetch idx #(1 2)) 46)
+    ))
+ 
 (deftest test-basic-0 ()
   (let ((environ:*env* (setup (list (basic:prog-b0)))))
         ;(rcvr (tc:receiver t:*test-suite*))