diff --git a/csys/csys.lisp b/csys/csys.lisp index 51c2ac0..149d194 100644 --- a/csys/csys.lisp +++ b/csys/csys.lisp @@ -103,7 +103,7 @@ (defun notify-created (msg new scope) (let* ((head (list (message:domain msg) :created)) - (data (util:plist-merge (shape:data msg) '(:new new :parent actor:*self*))) + (data (util:plist-merge (shape:data msg) `(:new ,new :parent ,actor:*self*))) (msg1 (message:create head :data data))) (notify msg1 scope)) ) diff --git a/csys/environ.lisp b/csys/environ.lisp index f714dcd..ee0f130 100644 --- a/csys/environ.lisp +++ b/csys/environ.lisp @@ -25,7 +25,7 @@ (defun actions () (list :created #'cell-created - :default #'csys:no-op)) + :default #'forward)) (defun cell-created (msg scope) (let* ((data (shape:data msg)) @@ -34,12 +34,10 @@ (register-cell (cells scope) addr (getf data :new))) (list msg scope))) -(defun forward-message (head scope &key data customer) - (forward (message:create head :data data :customer customer) scope)) - (defun forward (msg scope) (dolist (cell (find-cells (cells scope) (message:addr msg))) - (actor:send cell msg))) + (actor:send cell msg)) + (list msg scope)) ;;;; helpers diff --git a/test/test-csys.lisp b/test/test-csys.lisp index 3a0cd20..de01794 100644 --- a/test/test-csys.lisp +++ b/test/test-csys.lisp @@ -60,13 +60,14 @@ (setf (tc:receiver t:*test-suite*) recv) ;(csys:create-zero (test-program) env) (csys:create-zero (csys:make-program #'csys:std-proc) env) - )) + env)) (deftest test-basic-0 () - (setup-test-basic-0) + (let ((env (setup-test-basic-0))) (sleep 0.1) - (core:shutdown) - ) + (actor:send env (message:create '(:csys :value :c00 "0-0") :data '(:value 1))) + (sleep 0.1) + (core:shutdown))) (deftest x-test-init () ;(csys:send-message '(:csys :sensor :init :zero) '(:std :s1))