From 6b272ad3d3eec1e42f9b59f8ec5832fdd6bc0023 Mon Sep 17 00:00:00 2001
From: Sam Caldwell <samc@ccs.neu.edu>
Date: Fri, 31 May 2019 10:01:36 -0400
Subject: [PATCH] cleanups and improvements

---
 racket/typed/core-expressions.rkt |  42 ++++-----
 racket/typed/core-types.rkt       | 143 ++++++++++++------------------
 racket/typed/roles.rkt            |  47 +++-------
 3 files changed, 85 insertions(+), 147 deletions(-)

diff --git a/racket/typed/core-expressions.rkt b/racket/typed/core-expressions.rkt
index b5f6917..9361a2d 100644
--- a/racket/typed/core-expressions.rkt
+++ b/racket/typed/core-expressions.rkt
@@ -69,7 +69,7 @@
       (⇒ ν-ep (~effs eps1 ...)) (⇒ ν-f (~effs fs1 ...)) (⇒ ν-s (~effs ss1 ...))]
    [⊢ e2 ≫ e2- (⇒ : τ2)
       (⇒ ν-ep (~effs eps2 ...)) (⇒ ν-f (~effs fs2 ...)) (⇒ ν-s (~effs ss2 ...))]
-   #:with τ (type-eval #'(U τ1 τ2))
+   #:with τ (mk-U- #'(τ1 τ2))
    --------
    [⊢ (if- e_tst- e1- e2-) (⇒ : τ)
       (⇒ ν-ep (eps1 ... eps2 ...))
@@ -286,20 +286,18 @@
             #:when (stx-length=? #'(p ...) #'(tt ...))
             #t]
            [_ #f]))
-       (define selected
-         (syntax-parse ty
-           [tt
-            #:when (matching? ty)
-            #'tt]
-           [(~U* (~or (~and tt (~fail #:unless (matching? #'tt)))
-                      _) ...)
-            (mk-U- #'(tt ...))]))
        (define (proj t i)
          (syntax-parse t
            [(~Tuple tt ...)
-            (stx-list-ref #'(tt ...) i)]
-           [(~U* tt ...)
-            (mk-U- (stx-map (lambda (x) (proj x i)) #'(tt ...)))]))
+            (if (= i -1)
+                t
+                (stx-list-ref #'(tt ...) i))]
+           [(~U* (~or (~and tt (~fail #:unless (or (U*? #'tt) (matching? #'tt))))
+                      _) ...)
+            (mk-U- (stx-map (lambda (x) (proj x i)) #'(tt ...)))]
+           [_
+            (mk-U*- '())]))
+       (define selected (proj ty -1))
        (define sub-pats
          (for/list ([pat (in-syntax #'(p ...))]
                     [i (in-naturals)])
@@ -315,20 +313,18 @@
             #:when (stx-length=? #'(p ...) #'(tt ...))
             #t]
            [_ #f]))
-       (define selected
-         (syntax-parse ty
-           [tt
-            #:when (matching? ty)
-            #'tt]
-           [(~U* (~or (~and tt (~fail #:unless (matching? #'tt)))
-                      _) ...)
-            (mk-U- #'(tt ...))]))
        (define (proj t i)
          (syntax-parse t
            [(~constructor-type _ tt ...)
-            (stx-list-ref #'(tt ...) i)]
-           [(~U* tt ...)
-            (mk-U- (stx-map (lambda (x) (proj x i)) #'(tt ...)))]))
+            (if (= i -1)
+                t
+                (stx-list-ref #'(tt ...) i))]
+           [(~U* (~or (~and tt (~fail #:unless (or (U*? #'tt) (matching? #'tt))))
+                      _) ...)
+            (mk-U- (stx-map (lambda (x) (proj x i)) #'(tt ...)))]
+           [_
+            (mk-U*- '())]))
+       (define selected (proj ty -1))
        (define sub-pats
          (for/list ([pat (in-syntax #'(p ...))]
                     [i (in-naturals)])
diff --git a/racket/typed/core-types.rkt b/racket/typed/core-types.rkt
index 6c3771d..dd9c84e 100644
--- a/racket/typed/core-types.rkt
+++ b/racket/typed/core-types.rkt
@@ -46,24 +46,19 @@
 
 (begin-for-syntax
   (struct type-metadata (isec cons) #:transparent)
-  ;; (IdTable type-metadata)
-  (define TypeInfo# (make-free-id-table))
   ;; (MutableHashOf Symbol type-metadata)
-  (define TypeInfo#* (make-hash))
+  (define TypeInfo# (make-hash))
   ;; Identifier isect-desc TypeCons -> Void
   (define (set-type-info! ty-cons isec cons)
-    (free-id-table-set! TypeInfo#
-                        ty-cons
-                        (type-metadata isec cons)))
-  (define (set-type-info!* ty-cons isec cons)
-    (when (hash-has-key? TypeInfo#* ty-cons)
+    (when (hash-has-key? TypeInfo# ty-cons)
       ;; TODO
       #f)
-    (hash-set! TypeInfo#*
+    (hash-set! TypeInfo#
                ty-cons
                (type-metadata isec cons)))
   ;; Identifier -> Symbol
   ;; XYZ-.*
+  ;; based on the convention used by turnstile *shrug*
   (define (un- id)
     (define match?
       (regexp-match #px"^(\\S*)-\\S*$" (symbol->string (syntax-e id))))
@@ -71,9 +66,7 @@
 
   ;; Identifier -> (U #f type-metadata)
   (define (get-type-info ty-cons)
-    (free-id-table-ref TypeInfo# ty-cons #f))
-  (define (get-type-info* ty-cons)
-    (hash-ref TypeInfo#* (un- ty-cons) #f))
+    (hash-ref TypeInfo# (un- ty-cons) #f))
 
   ;; Identifier -> (U #f isec-desc)
   (define (get-type-isec-desc ty-cons)
@@ -83,14 +76,6 @@
   (define (get-type-cons ty-cons)
     (define result? (get-type-info ty-cons))
     (and result? (type-metadata-cons result?)))
-  ;; Identifier -> (U #f isec-desc)
-  (define (get-type-isec-desc* ty-cons)
-    (define result? (get-type-info* ty-cons))
-    (and result? (type-metadata-isec result?)))
-  ;; Identifier -> (U #f TypeCons)
-  (define (get-type-cons* ty-cons)
-    (define result? (get-type-info* ty-cons))
-    (and result? (type-metadata-cons result?)))
 
   ;; a isect-desc describes how a type (constructor) behaves with respect to
   ;; intersection, and is one of
@@ -128,13 +113,13 @@
   ;; Identifier -> Bool
   ;; check if the type has a syntax property allowing us to create new instances
   (define (reassemblable? t)
-    (and (get-type-cons* t) #t))
+    (and (get-type-cons t) #t))
 
   ;; Identifier (Listof Type) -> Type
   ;; Create a new instance of the type with the given arguments
   ;; needs to have the type-cons-key
   (define (reassemble-type ty args)
-    (define tycons (get-type-cons* ty))
+    (define tycons (get-type-cons ty))
     (unless tycons
       (error "expected to find type-cons-key"))
     (tycons args)))
@@ -165,8 +150,7 @@
               (syntax/loc stx
                 (Name- t (... ...)))]))
          (begin-for-syntax
-           #;(set-type-info! #'Name- '#,(attribute desc.val) #'mk-)
-           (set-type-info!* 'Name '#,(attribute desc.val) mk-)
+           (set-type-info! 'Name '#,(attribute desc.val) mk-)
            (define-syntax NamePat
              (pattern-expander
               (syntax-parser
@@ -667,7 +651,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-for-syntax (bot? t)
-  ((current-typecheck-relation) t (type-eval #'(U*))))
+  ((current-typecheck-relation) t (mk-U*- '())))
 
 (define-for-syntax (flat-type? τ)
   (syntax-parse τ
@@ -677,49 +661,44 @@
     [_ #t]))
 
 (define-for-syntax (strip-? t)
-  (type-eval
-   (syntax-parse t
-     [(~U* τ ...) #`(U #,@(stx-map strip-? #'(τ ...)))]
-     [~★/t #'★/t]
-     ;; since (Observe X) can match (Message X):
-     ;; doing this specifically for the intersection operation in the spawn rule, need to check other
-     ;; uses
-     [(~Observe τ) #'(U τ (Message τ))]
-     [_ #'(U*)])))
+  (syntax-parse t
+    [(~U* τ ...) (mk-U- (stx-map strip-? #'(τ ...)))]
+    [~★/t (type-eval #'★/t)]
+    ;; since (Observe X) can match (Message X):
+    ;; doing this specifically for the intersection operation in the spawn rule, need to check other
+    ;; uses
+    [(~Observe τ) (mk-U- (list #'τ (mk-Message- #'(τ))))]
+    [_ (mk-U*- '())]))
 
 ;; similar to strip- fns, but leave non-message types as they are
 (define-for-syntax (prune-message t)
-  (type-eval
-   (syntax-parse t
-     [(~U* τ ...) #`(U #,@(stx-map prune-message #'(τ ...)))]
-     [~★/t #'★/t]
-     [(~Message τ) #'τ]
-     [_ t])))
+  (syntax-parse t
+    [(~U* τ ...) (mk-U- (stx-map prune-message #'(τ ...)))]
+    [~★/t (type-eval #'★/t)]
+    [(~Message τ) #'τ]
+    [_ t]))
 
 (define-for-syntax (strip-inbound t)
-  (type-eval
-   (syntax-parse t
-     [(~U* τ ...) #`(U #,@(stx-map strip-inbound #'(τ ...)))]
-     [~★/t #'★/t]
-     [(~Inbound τ) #'τ]
-     [_ #'(U*)])))
+  (syntax-parse t
+    [(~U* τ ...) (mk-U- (stx-map strip-inbound #'(τ ...)))]
+    [~★/t (type-eval #'★/t)]
+    [(~Inbound τ) #'τ]
+    [_ (mk-U*- '())]))
 
 (define-for-syntax (strip-outbound t)
-  (type-eval
-   (syntax-parse t
-     [(~U* τ ...) #`(U #,@(stx-map strip-outbound #'(τ ...)))]
-     [~★/t #'★/t]
-     [(~Outbound τ) #'τ]
-     [_ #'(U*)])))
+  (syntax-parse t
+    [(~U* τ ...) (mk-U- (stx-map strip-outbound #'(τ ...)))]
+    [~★/t (type-eval #'★/t)]
+    [(~Outbound τ) #'τ]
+    [_ (mk-U*- '())]))
 
 (define-for-syntax (relay-interests t)
-  (type-eval
-   (syntax-parse t
-     ;; TODO: probably need to `normalize` the result
-     [(~U* τ ...) #`(U #,@(stx-map relay-interests #'(τ ...)))]
-     [~★/t #'★/t]
-     [(~Observe (~Inbound τ)) #'(Observe τ)]
-     [_ #'(U*)])))
+  (syntax-parse t
+    ;; TODO: probably need to `normalize` the result
+    [(~U* τ ...) (mk-U- (stx-map relay-interests #'(τ ...)))]
+    [~★/t (type-eval #'★/t)]
+    [(~Observe (~Inbound τ)) (mk-Observe- #'(τ))]
+    [_ (mk-U*- '())]))
 
 ;; (SyntaxOf RoleType ...) -> (Syntaxof InputType OutputType SpawnType)
 (define-for-syntax (analyze-roles rs)
@@ -730,9 +709,9 @@
               ([r (in-syntax rs)])
       (define-values (i o s) (analyze-role-input/output r))
       (values (cons i is) (cons o os) (cons s ss))))
-  #`(#,(type-eval #`(U #,@lis))
-     #,(type-eval #`(U #,@los))
-     #,(type-eval #`(U #,@lss))))
+  #`(#,(mk-U- lis)
+     #,(mk-U- los)
+     #,(mk-U- lss)))
 
 ;; Wanted test case, but can't use it bc it uses things defined for-syntax
 #;(module+ test
@@ -753,12 +732,14 @@
     [(~Actor τc)
      (values (mk-U*- '()) (mk-U*- '()) t)]
     [(~Sends τ-m)
-     (values (mk-U*- '()) (type-eval #'(Message τ-m)) (mk-U*- '()))]
+     (values (mk-U*- '()) (mk-Message- #'(τ-m)) (mk-U*- '()))]
     [(~Role (name:id)
        (~or (~Shares τ-s)
             (~Sends τ-m)
             (~Reacts τ-if τ-then ...)) ...
        (~and (~Role _ ...) sub-role) ...)
+     #:with (msg ...) (for/list ([m (in-syntax #'(τ-m ...))])
+                        (mk-Message- (list m)))
      (define-values (is os ss)
        (for/fold ([ins '()]
                   [outs '()]
@@ -767,9 +748,9 @@
          (define-values (i o s) (analyze-role-input/output t))
          (values (cons i ins) (cons o outs) (cons s spawns))))
      (define pat-types (stx-map event-desc-type #'(τ-if ...)))
-     (values (type-eval #`(U #,@is #,@pat-types))
-             (type-eval #`(U τ-s ... (Message τ-m) ... #,@os #,@(stx-map pattern-sub-type pat-types)))
-             (type-eval #`(U #,@ss)))]))
+     (values (mk-U- #`(#,@is #,@pat-types))
+             (mk-U- #`(τ-s ... msg ... #,@os #,@(stx-map pattern-sub-type pat-types)))
+             (mk-U- ss))]))
 
 ;; EventDescriptorType -> Type
 (define-for-syntax (event-desc-type desc)
@@ -777,20 +758,20 @@
     [(~Know τ) #'τ]
     [(~¬Know τ) #'τ]
     [(~Message τ) desc]
-    [_ (type-eval #'(U*))]))
+    [_ (mk-U*- '())]))
 
 ;; PatternType -> Type
 (define-for-syntax (pattern-sub-type pt)
   (syntax-parse pt
     [(~Message τ)
      (define t (replace-bind-and-discard-with-★ #'τ))
-     (type-eval #`(Observe #,t))]
+     (mk-Observe- (list t))]
     [τ
      #:when (bot? #'τ)
      #'τ]
     [τ
      (define t (replace-bind-and-discard-with-★ #'τ))
-     (type-eval #`(Observe #,t))]))
+     (mk-Observe- (list t))]))
 
 ;; TODO : can potentially use something like `subst` for this
 (define-for-syntax (replace-bind-and-discard-with-★ t)
@@ -929,15 +910,12 @@
     [(~★/t _)
      t2]
     [((~U* τ1:type ...) _)
-     (type-eval #`(U #,@(stx-map (lambda (t) (∩ t t2)) #'(τ1 ...))))]
+     (mk-U- (stx-map (lambda (t) (∩ t t2)) #'(τ1 ...)))]
     [(_ (~U* τ2:type ...))
-     (type-eval #`(U #,@(stx-map (lambda (t) (∩ t1 t)) #'(τ2 ...))))]
+     (mk-U- (stx-map (lambda (t) (∩ t1 t)) #'(τ2 ...)))]
     [(X:id Y:id)
      #:when (free-identifier=? #'X #'Y)
      #'X]
-    [((~AssertionSet τ1) (~AssertionSet τ2))
-     #:with τ12 (∩ #'τ1 #'τ2)
-     (type-eval #'(AssertionSet τ12))]
     ;; Also, using <: is OK, even though <: refers to ∩, because <:'s use of ∩ is only
     ;; in the Actor case.
     [((~Base τ1:id) (~Base τ2:id))
@@ -956,9 +934,9 @@
         (reassemble-type #'τ-cons1 slots)]
        [(== PRODUCT-LIKE)
         (if (ormap bot? slots)
-            (type-eval #'(U))
+            (mk-U*- '())
             (reassemble-type #'τ-cons1 slots))])]
-    [_ (type-eval #'(U))]))
+    [_ (mk-U*- '())]))
 
 ;; Type Type -> Bool
 ;; first type is the contents of the set/dataspace
@@ -1016,7 +994,7 @@
     [~Discard
      (type-eval #'★/t)]
     [(~U* τ ...)
-     (type-eval #`(U #,@(stx-map pattern-matching-assertions #'(τ ...))))]
+     (mk-U- (stx-map pattern-matching-assertions #'(τ ...)))]
     [(~Any/bvs τ-cons () τ ...)
      #:when (reassemblable? #'τ-cons)
      (define subitems (for/list ([t (in-syntax #'(τ ...))])
@@ -1568,14 +1546,3 @@
                      (stx-contains-id? #'ty X)))
        (stx-map (λ _ irrelevant) Xs)]
       [_ (stx-map (λ _ invariant) Xs)])))
-
-#;(begin-for-syntax
-  (define k (sixth (free-id-table-keys TypeInfo#)))
-  (define t
-    (syntax-parse (type-eval #'(Observe (Bind (Tuple))))
-      [(~Any/bvs cons () tt ...)
-       #'cons]))
-  (displayln k)
-  (displayln (hash-ref (syntax-debug-info k) 'bindings))
-  (displayln t)
-  (displayln (hash-ref (syntax-debug-info t) 'bindings)))
diff --git a/racket/typed/roles.rkt b/racket/typed/roles.rkt
index 5a508c0..9f99353 100644
--- a/racket/typed/roles.rkt
+++ b/racket/typed/roles.rkt
@@ -159,7 +159,7 @@
 (define-typed-syntax (assert e:expr) ≫
   [⊢ e ≫ e- (⇒ : τ)]
   #:fail-unless (pure? #'e-) "expression not allowed to have effects"
-  #:with τs (type-eval #'(Shares τ))
+  #:with τs (mk-Shares- #'(τ))
   -------------------------------------
   [⊢ (syndicate:assert e-) (⇒ : ★/t)
                            (⇒ ν-ep (τs))])
@@ -167,10 +167,10 @@
 (define-typed-syntax (send! e:expr) ≫
   [⊢ e ≫ e- (⇒ : τ)]
   #:fail-unless (pure? #'e-) "expression not allowed to have effects"
-  #:with τm (type-eval #'(Sends τ))
+  #:with τm (mk-Sends- #'(τ))
   --------------------------------------
-  [⊢ (syndicate:send! e-) (⇒ : ★/t)
-                          (⇒ ν-f (τm))])
+  [⊢ (#%app- syndicate:send! e-) (⇒ : ★/t)
+                                 (⇒ ν-f (τm))])
 
 (define-typed-syntax (stop facet-name:id cont ...) ≫
   [⊢ facet-name ≫ facet-name- (⇐ : FacetName)]
@@ -234,7 +234,10 @@
   [(on (a/r/m:asserted/retracted/message p)
        priority:priority
        s ...) ≫
-   #:with p/e (elaborate-pattern/with-com-ty #'p)
+   #:do [(define msg? (free-identifier=? #'syndicate:message (attribute a/r/m.syndicate-kw)))
+         (define elab
+           (elaborate-pattern/with-com-ty (if msg? #'(message p) #'p)))]
+   #:with p/e (if msg? (stx-cadr elab) elab)
    [⊢ p/e ≫ p-- (⇒ : τp)]
    #:fail-unless (pure? #'p--) "pattern not allowed to have effects"
    #:with ([x:id τ:type] ...) (pat-bindings #'p/e)
@@ -281,13 +284,12 @@
   #:with (τ-i τ-o τ-a) (analyze-roles #'(τ-f ...))
   #:fail-unless (<: #'τ-o #'τ-c.norm)
                 (format "Output ~a not valid in dataspace ~a" (type->str #'τ-o) (type->str #'τ-c.norm))
-  #:fail-unless (<: #'τ-a
-                    (type-eval #'(Actor τ-c.norm)))
+  #:with τ-final (mk-Actor- #'(τ-c.norm))
+  #:fail-unless (<: #'τ-a #'τ-final)
                 "Spawned actors not valid in dataspace"
   #:fail-unless (project-safe? (∩ (strip-? #'τ-o) #'τ-c.norm)
                                #'τ-i)
                 "Not prepared to handle all inputs"
-  #:with τ-final (type-eval #'(Actor τ-c.norm))
   --------------------------------------------------------------------------------------------
   [⊢ (syndicate:spawn (syndicate:on-start s-)) (⇒ : ★/t)
                                                (⇒ ν-s (τ-final))]]
@@ -303,7 +305,7 @@
     [
      [⊢ s ≫ s- (⇒ ν-ep (~effs)) (⇒ ν-s (~effs τ-s ...)) (⇒ ν-f (~effs))] ...
     ]
-  #:with τ-actor (type-eval #'(Actor τ-c.norm))
+  #:with τ-actor (mk-Actor- #'(τ-c.norm))
   #:fail-unless (stx-andmap (lambda (t) (<: t #'τ-actor)) #'(τ-s ... ...))
                 "Not all actors conform to communication type"
   #:with τ-ds-i (strip-inbound #'τ-c.norm)
@@ -387,7 +389,6 @@
                 (set! x e0-)
                 remove.expr))])
 
-;; TODO: #:on-add
 (define-typed-syntax (define/query-set x:id p e
                        (~optional add:on-add)
                        (~optional remove:on-remove)) ≫
@@ -440,32 +441,6 @@
   ------------------------
   [⊢ (#%app- x-) (⇒ : τ)])
 
-;; it would be nice to abstract over these three
-;; TODO - make the constructors
-#;(define-typed-syntax (observe e:expr) ≫
-  [⊢ e ≫ e- (⇒ : τ)]
-  #:fail-unless (pure? #'e-) "expression not allowed to have effects"
-  ---------------------------------------------------------------------------
-  [⊢ (syndicate:observe e-) (⇒ : (Observe τ))])
-
-#;(define-typed-syntax (inbound e:expr) ≫
-  [⊢ e ≫ e- (⇒ : τ)]
-  #:fail-unless (pure? #'e-) "expression not allowed to have effects"
-  ---------------------------------------------------------------------------
-  [⊢ (syndicate:inbound e-) (⇒ : (Inbound τ))])
-
-#;(define-typed-syntax (outbound e:expr) ≫
-  [⊢ e ≫ e- (⇒ : τ)]
-  #:fail-unless (pure? #'e-) "expression not allowed to have effects"
-  ---------------------------------------------------------------------------
-  [⊢ (syndicate:outbound e-) (⇒ : (Outbound τ))])
-
-#;(define-typed-syntax (message e:expr) ≫
-  [⊢ e ≫ e- (⇒ : τ)]
-  #:fail-unless (pure? #'e-) "expression must be pure"
-  ------------------------------
-  [⊢ (syndicate:message e-) (⇒ : (Message τ))])
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Ground Dataspace
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;