csys:program: move program.lisp to program/basic.lisp
This commit is contained in:
parent
40d1ea84e3
commit
0c47aec77d
4 changed files with 9 additions and 9 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
;;;; cl-scopes/csys/program - common and general csys program definitions
|
;;;; cl-scopes/csys/program/basic - common and general csys program definitions
|
||||||
|
|
||||||
(defpackage :scopes/csys/program
|
(defpackage :scopes/csys/program/basic
|
||||||
(:use :common-lisp)
|
(:use :common-lisp)
|
||||||
(:local-nicknames (:actor :scopes/core/actor)
|
(:local-nicknames (:actor :scopes/core/actor)
|
||||||
(:csys :scopes/csys)
|
(:csys :scopes/csys)
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
(:util :scopes/util))
|
(:util :scopes/util))
|
||||||
(:export #:basic-0 #:config-basic-1))
|
(:export #:basic-0 #:config-basic-1))
|
||||||
|
|
||||||
(in-package :scopes/csys/program)
|
(in-package :scopes/csys/program/basic)
|
||||||
|
|
||||||
;;;; basic-0: minimal recursive system
|
;;;; basic-0: minimal recursive system
|
||||||
|
|
||||||
|
|
@ -11,8 +11,7 @@
|
||||||
:depends-on (:scopes-core)
|
:depends-on (:scopes-core)
|
||||||
:components ((:file "csys/csys")
|
:components ((:file "csys/csys")
|
||||||
(:file "csys/environ" :depends-on ("csys/csys"))
|
(:file "csys/environ" :depends-on ("csys/csys"))
|
||||||
(:file "csys/program" :depends-on ("csys/csys" "csys/environ"))
|
(:file "csys/program/basic" :depends-on ("csys/csys" "csys/environ")))
|
||||||
)
|
|
||||||
:long-description "scopes/csys: Concurrent cybernetic communication systems."
|
:long-description "scopes/csys: Concurrent cybernetic communication systems."
|
||||||
:in-order-to ((test-op (test-op "scopes-csys/test"))))
|
:in-order-to ((test-op (test-op "scopes-csys/test"))))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,11 @@
|
||||||
|
|
||||||
;;;; csys stuff
|
;;;; csys stuff
|
||||||
|
|
||||||
|
(add-package-local-nickname :basic :scopes/csys/program/basic)
|
||||||
(add-package-local-nickname :environ :scopes/csys/environ)
|
(add-package-local-nickname :environ :scopes/csys/environ)
|
||||||
(add-package-local-nickname :program :scopes/csys/program)
|
|
||||||
|
|
||||||
(scopes/util/async:init)
|
(scopes/util/async:init)
|
||||||
(setf environ:*env* (environ:simple-setup (program:config-basic-1)))
|
(setf environ:*env* (environ:simple-setup (basic:config-basic-1)))
|
||||||
|
|
||||||
;(environ:send-value '(:s00 "0-1") 2)
|
;(environ:send-value '(:s00 "0-1") 2)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
(:local-nicknames (:alx :alexandria)
|
(:local-nicknames (:alx :alexandria)
|
||||||
(:actor :scopes/core/actor)
|
(:actor :scopes/core/actor)
|
||||||
(:async :scopes/util/async)
|
(:async :scopes/util/async)
|
||||||
|
(:basic :scopes/csys/program/basic)
|
||||||
(:config :scopes/config)
|
(:config :scopes/config)
|
||||||
(:core :scopes/core)
|
(:core :scopes/core)
|
||||||
(:csys :scopes/csys)
|
(:csys :scopes/csys)
|
||||||
|
|
@ -67,7 +68,7 @@
|
||||||
;;;; test definitions
|
;;;; test definitions
|
||||||
|
|
||||||
(deftest test-basic-0 ()
|
(deftest test-basic-0 ()
|
||||||
(let ((environ:*env* (setup-test (list (program:basic-0)))))
|
(let ((environ:*env* (setup-test (list (basic:basic-0)))))
|
||||||
;(rcvr (tc:receiver t:*test-suite*))
|
;(rcvr (tc:receiver t:*test-suite*))
|
||||||
(sleep 0.1)
|
(sleep 0.1)
|
||||||
;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1)))
|
;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1)))
|
||||||
|
|
@ -77,7 +78,7 @@
|
||||||
(core:shutdown)))
|
(core:shutdown)))
|
||||||
|
|
||||||
(deftest test-basic-1 ()
|
(deftest test-basic-1 ()
|
||||||
(let ((environ:*env* (setup-test (program:config-basic-1))))
|
(let ((environ:*env* (setup-test (basic:config-basic-1))))
|
||||||
(sleep 0.1)
|
(sleep 0.1)
|
||||||
(environ:send-value '(:s01 "0-0") 1)
|
(environ:send-value '(:s01 "0-0") 1)
|
||||||
(environ:send-value '(:s01 "0-1") 2)
|
(environ:send-value '(:s01 "0-1") 2)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue