cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

Compare commits

base: cco:0bf199388aafc4f404681fdc3c2774289f835246
Branches Tags
cco:master
..
compare: cco:bc6205b3cefb5a0228f7e9a8abf29049237fdf27
Branches Tags
cco:master

No commits in common. "0bf199388aafc4f404681fdc3c2774289f835246" and "bc6205b3cefb5a0228f7e9a8abf29049237fdf27" have entirely different histories.
0bf199388a ... bc6205b3ce

3 changed files with 24 additions and 39 deletions
Show stats Expand all files Collapse all files

20
csys/environ.lisp
View file

@ -95,29 +95,17 @@
(defun forward-connect (msg scope)
(let* ((data (shape:data msg))
(tgt (getf data :target)))
(when (listp tgt)
(setf (getf data :target) (find-cell (cells scope) tgt)))
(tgt (car (find-cells (cells scope) (getf data :target)))))
(setf (getf data :target) tgt)
(forward (message:create (shape:head msg) :data data) scope)))
;;;; public shortcuts
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*) delay)
(defun send-value (cat-loc val &key (domain csys:*domain*) (env *env*))
(let ((head (cons domain (cons :value cat-loc))))
(actor:send env (message:create head :data `(:value ,val)))))
(defun send-connect (rcvr target &key (domain csys:*domain*) (env *env*) op)
(let* ((cat-loc (when (listp rcvr) rcvr))
(head (cons domain (cons :connect cat-loc)))
(data (unless cat-loc (list :to rcvr))))
(when op (util:plist-add data :op op))
(when (and (listp target) (< (length target) 3))
(setf target (cons domain target)))
(util:plist-add data :target target)
(util:lgi rcvr target cat-loc head data)
(actor:send env (message:create head :data data))))
(defun x-send-connect (env &rest args &key (domain csys:*domain*) to target op)
(defun send-connect (env &rest args &key (domain csys:*domain*) addr to target op)
(let ((head (list domain :connect)))
(actor:send env (message:create head :data args))))

24
csys/program/basic.lisp
View file

@ -54,13 +54,10 @@
(defun b1-next-one ()
(lambda (msg scope)
(let ((self actor:*self*)
(environ:*env* (csys:environ scope))
(env (csys:environ scope)))
(environ:send-connect self '(:e01 "1-0") :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-0")
; :op (csys:multiply -1))
;(environ:send-connect env :to self :target '(:csys :e01 "1-1"))
(environ:send-connect self '(:e01 "1-1"))
(environ:send-connect env :to self :target '(:csys :e01 "1-0")
:op (csys:multiply -1))
(environ:send-connect env :to self :target '(:csys :e01 "1-1"))
;; switch :active
nil)))
@ -80,23 +77,26 @@
(defun b2-next-zero ()
(lambda (msg scope)
(let ((self actor:*self*))
(let ((self actor:*self*)
(env (csys:environ scope)))
(csys:send-create self :cat :c02 :loc "0-1" :value 2 :stage :basic)
(csys:send-create self :cat :s02 :loc "1-0" :connect :pred)
(csys:send-create self :cat :e02 :loc "2-0" :connect :succ)
;(environ:send-connect env :to self :target '(:csys :c02 "0-1") :op (csys:multiply -1))
;; switch :active
nil)))
(defun b2-next-one ()
(lambda (msg scope)
(let ((self actor:*self*)
(env (csys:environ scope))
(environ:*env* (csys:environ scope))
(zero '(:csys :c02 "0-0")))
(env (csys:environ scope)))
(csys:send-create self :cat :s02 :loc "1-1" :connect :pred)
(csys:send-create self :cat :e02 :loc "2-1" :connect :succ)
(environ:send-connect self '(:c02 "0-0") :op (csys:multiply -1))
(environ:send-connect '(:c02 "0-0") self :op (csys:multiply -1))
(environ:send-connect env :to self :target '(:csys :c02 "0-0")
:op (csys:multiply -1))
(actor:send env
(message:create '(:csys :connect :c02 "0-0")
:data (list :target '(:csys :c02 "0-1") :op (csys:multiply -1))))
;; switch :active
nil)))

19
test/test-csys.lisp
View file

@ -52,7 +52,7 @@
(test-basic-0)
(test-basic-1)
(test-basic-2)
(sleep 0.02)
(sleep 0.1)
(tc:check-expected)
(t:show-result))))
@ -71,29 +71,26 @@
(deftest test-basic-0 ()
(let ((environ:*env* (setup-test (list (basic:prog-b0)))))
;(rcvr (tc:receiver t:*test-suite*))
(sleep 0.02)
(sleep 0.1)
;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1)))
(environ:send-value '(:s00 "0-1") 1)
(environ:send-value '(:s00 "0-1") 2)
(sleep 0.03)
(sleep 0.1)
(core:shutdown)))
(deftest test-basic-1 ()
(let ((environ:*env* (setup-test (basic:config-b1))))
(sleep 0.02)
(sleep 0.1)
(environ:send-value '(:s01 "0-0") 1)
(environ:send-value '(:s01 "0-1") 2)
(sleep 0.03)
(sleep 0.1)
(core:shutdown)))
(deftest test-basic-2 ()
(let ((environ:*env* (setup-test (basic:config-b2))))
(sleep 0.02)
(sleep 0.2)
(environ:send-value '(:s02 "1-0") 1)
(sleep 0.0001)
(environ:send-value '(:s02 "1-1") 2) ;; 2 => loop
(sleep 0.0001)
(environ:send-value '(:s02 "1-0") 2) ;; stop loop
(sleep 0.03)
(environ:send-value '(:s02 "1-1") 1) ;; 2 => loop
(sleep 0.1)
(core:shutdown)))