sort out relaying in hll interperter

This commit is contained in:
Sam Caldwell 2017-03-07 13:01:11 -05:00
parent df40cc7ba9
commit 079e2da53d
1 changed files with 80 additions and 58 deletions

View File

@ -272,7 +272,10 @@
[`(dataspace ,as ...)
(define boot-actions (for/list ([a (in-list as)])
(boot-actor a Γ)))
(spawn-dataspace boot-actions)]))
;; note the recursive upside-down wrapping of dataspaces--
;; the upside-down-relay is needed for things to line up properly
(spawn-upside-down
(dataspace-actor (cons upside-down-relay boot-actions)))]))
;; eval-exp : exp Γ σ -> (Continue val)
(define (eval-exp e Γ σ)
@ -670,7 +673,7 @@
(define boot-actions
(for/list ([boot (in-list p)])
(boot-actor boot mt-Γ)))
(run-ground boot-actions))
(run-ground (cons upside-down-relay boot-actions)))
;; Actor AsyncChannel Program -> Boolean
;; trace-actor is the first actor spawned inside the program's ground dataspace
@ -684,7 +687,7 @@
(define syndicate-thread
(thread (lambda ()
(engine-run timeout
(engine (lambda (x) (run-ground (cons trace-actor boot-actions))))))))
(engine (lambda (x) (run-ground (cons trace-actor (cons upside-down-relay boot-actions)))))))))
(define result
(sync (handle-evt chan
(lambda (val) #t))
@ -724,6 +727,8 @@
(syntax/loc stx
(check-true (run-with-trace any ...)))]))
(module+ test
(define test-program
`((actor (react (on-start (printf "hello,world\n"))))))
@ -776,8 +781,10 @@
(send! (list "deposit" -30)))))))
(test-trace (trace (assertion-added '(list "account" 0))
(and (assertion-added '(list "account" 100)) (assertion-removed '(list "account" 0)))
(and (assertion-added '(list "account" 70)) (assertion-removed '(list "account" 100))))
(and (assertion-added '(list "account" 100))
(assertion-removed '(list "account" 0)))
(and (assertion-added '(list "account" 70))
(assertion-removed '(list "account" 100))))
bank-account
#:timeout 5000)
@ -787,10 +794,25 @@
(printf "goodbye"))))
(dataspace (actor (react (assert (outbound "hello")))))))
;; this fails because upside-down doesn't handle relaying right
#;(test-trace (trace (assertion-added "hello"))
(test-trace (trace (assertion-added "hello"))
multi-level-ex)
(define multi-level-message
'(
(actor (react (on (message "hello"))))
(dataspace (actor (react (on-start (send! (outbound "hello"))))))))
(test-trace (trace (message "hello"))
multi-level-message)
(define multi-level-other-way
'(
(dataspace (actor (react (on (asserted (inbound "gday"))
(send! (outbound "good things"))))))
(actor (react (assert "gday")))))
(test-trace (trace (message "good things"))
multi-level-other-way))
(define ff
'(
(actor (react (on (message 5)