csys/csys.lisp

@@ -76,14 +76,14 @@
 (defun std-proc (msg scope &key (default #'remember) params actions)
   (util:mv-bind (nmsg (nscope scope)) 
       (handle-action msg scope :default default :actions actions :params params)
-    (when nmsg (forward nmsg (syns nscope)))
+    (forward nmsg (syns nscope))
     (update nscope)))
 
 (defun eff-proc (msg scope &key params actions)
   (util:mv-bind (nmsg (nscope scope)) 
-      (handle-action msg scope :default (no-op) :actions actions :params params)
-    (setf (nth 1 (shape:head nmsg)) :effect)
-    (when nmsg (notify nmsg nscope))
+      (handle-action msg scope :default #'no-op :actions actions :params params)
+    (setf (nth 1 (shape:head nmsg)) :notify)
+    (notify nmsg nscope)
     (update nscope)))
 
 (defun create (msg scope)
@@ -100,7 +100,7 @@
   (dolist (s syns) 
     (funcall s msg)))
 
-(defun handle-action (msg scope &key (default (no-op)) actions params)
+(defun handle-action (msg scope &key (default #'no-op) actions params)
   (let* ((key (message:action msg))
          (act (getf actions key (getf actions :default default))))
     (apply act msg scope params)))
@@ -113,9 +113,7 @@
 
 ;;;; predefined neuron actions
 
-(defun no-op (&key stop) 
-  (lambda (msg scope) 
-    (unless stop msg)))
+(defun no-op (msg scope) msg)
 
 (defun remember (msg scope)
   (setf (value scope) (shape:data-value msg :value))

csys/environ.lisp

@@ -25,10 +25,8 @@
 
 (defun actions () 
   (list :created #'cell-created
-        :notify (csys:no-op)
-        :effect (csys:no-op)
-        :value #'forward
-        :default (csys:no-op :stop t)))
+        :notify #'csys:no-op
+        :default #'forward))
 
 (defun cell-created (msg scope)
   (let* ((data (shape:data msg))
@@ -40,7 +38,7 @@
 (defun forward (msg scope)
   (dolist (cell (find-cells (cells scope) (message:addr msg))) 
     (actor:send cell msg))
-  nil)
+  msg)
  
 ;;;; helpers
 

test/test-csys.lisp

@@ -29,8 +29,7 @@
 
 (defun setup-config ()
   (config:add :test-receiver :setup #'tc:setup)
-  ;(config:add-action '(:csys :effect :c00 "0-0") (value-in '(1)))
-  (config:add-action '(:csys :effect) #'tc:check-message)
+  (config:add-action '(:csys :notify :c00 "0-0") (value-in '(1)))
   (config:add-action '(:csys) (constantly nil))
   )
 
@@ -39,8 +38,7 @@
     (util:mv-bind (nmsg (scope scope)) 
         (csys:handle-action msg scope :actions (environ:actions))
       (util:lgi nmsg (tc:receiver t:*test-suite*))
-      (when nmsg
-        (actor:send (core:mailbox (tc:receiver t:*test-suite*)) nmsg)))))
+      (actor:send (core:mailbox (tc:receiver t:*test-suite*)) nmsg))))
 
 (defun run ()
   (let ((t:*test-suite* (make-instance 'tc:test-suite :name "csys")))
@@ -49,7 +47,6 @@
     (unwind-protect
       (test-basic-0)
       (sleep 0.1)
-      (tc:check-expected)
       (t:show-result))))
 
 ;;;; test: initialization
@@ -65,10 +62,8 @@
     env))
 
 (deftest test-basic-0 ()
-  (let ((env (setup-test (csys:make-program #'csys:eff-proc)))
-        (rcvr (tc:receiver t:*test-suite*)))
+  (let ((env (setup-test (csys:make-program #'csys:eff-proc))))
     (sleep 0.1)
-    (tc:expect rcvr (message:create '(:csys :effect :c00 "0-0") :data '(:value 1)))
     (actor:send env (message:create '(:csys :value :c00 "0-0") :data '(:value 1)))
     (sleep 0.1)
     (core:shutdown)))