From 71c2846a930336454d0aa41506187d78307b0dc3 Mon Sep 17 00:00:00 2001
From: Sam Caldwell <samcaldwell@utexas.edu>
Date: Thu, 26 Jul 2018 17:16:06 -0400
Subject: [PATCH] roles for bank account facets

---
 racket/typed/examples/roles/bank-account.rkt | 13 +++++++++-
 racket/typed/roles.rkt                       | 26 ++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/racket/typed/examples/roles/bank-account.rkt b/racket/typed/examples/roles/bank-account.rkt
index de30788..3c5ef2b 100644
--- a/racket/typed/examples/roles/bank-account.rkt
+++ b/racket/typed/examples/roles/bank-account.rkt
@@ -27,7 +27,18 @@
         (set! balance (+ (ref balance) amount))))))
 
 (spawn ds-type
+  (print-role
   (start-facet observer
     (fields)
     (on (asserted (account (bind amount Int)))
-        (displayln amount))))
\ No newline at end of file
+        (displayln amount)))))
+
+(spawn ds-type
+  (print-role
+  (start-facet buyer
+    (fields)
+    (on (asserted (observe (deposit discard)))
+        (start-facet deposits
+          (fields)
+          (assert (deposit 100))
+          (assert (deposit -30)))))))
\ No newline at end of file
diff --git a/racket/typed/roles.rkt b/racket/typed/roles.rkt
index 89b82a7..f6130f7 100644
--- a/racket/typed/roles.rkt
+++ b/racket/typed/roles.rkt
@@ -102,6 +102,22 @@
          (stx-car #'tys-)
          (syntax/loc stx (U* . tys-)))]))
 
+;; for looking at the "effects"
+(begin-for-syntax
+  (define-syntax ~effs
+    (pattern-expander
+     (syntax-parser
+       [(_ eff:id ...)
+        #:with tmp (generate-temporary 'effss)
+        #'(~and tmp
+                (~parse (eff ...) (stx-or #'tmp #'())))])))
+
+  (define (stx-truth? a)
+    (and a (not (and (syntax? a) (false? (syntax-e a))))))
+  (define (stx-or a b)
+    (cond [(stx-truth? a) a]
+          [else b])))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; User Defined Types, aka Constructors
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -430,11 +446,11 @@
    [⊢ p ≫ _ (⇒ : τp)]
    #:with p- (compile-syndicate-pattern #'p)
    #:with ([x:id τ:type] ...) (pat-bindings #'p)
-   [[x ≫ x- : τ a (U*) r (U*) e (U*)] ... ⊢ s ≫ s-  (⇒ a τ-as) (⇒ r τ-rs) (⇒ e (τ-e ...))]
-   #:do [(displayln (stx-map type->str #'τ-as))]
-   #:do [(displayln (stx-andmap bot? #'τ-as))]
-   ;; #:do [(displayln (stx-andmap bot? #'τ-rs))]
-   #:fail-unless (and (stx-andmap bot? #'τ-as) (stx-andmap bot? #'τ-rs)) "illegal context"
+   [[x ≫ x- : τ] ... ⊢ s ≫ s-  (⇒ a (~effs τ-as ...))
+                                      (⇒ r (~effs τ-rs ...))
+                                      (⇒ e (~effs τ-e ...))]
+   #:fail-unless (and (stx-andmap bot? #'(τ-as ...)) (stx-andmap bot? #'(τ-rs ...)))
+                 "illegal context"
    #:with (rhs ...) (if (stx-null? #'(τ-e ...)) #'((U*)) #'(τ-e ...))
    #:with τ-r #'(Reaction (a/r.react-con τp) rhs ...)
    -----------------------------------