Fix ommission of match in literals.

Author: dvanhorn

langs/mountebank/ast.rkt

@@ -50,6 +50,7 @@
 ;;           | (PBox Pat)
 ;;           | (PCons Pat Pat)
 ;;           | (PAnd Pat Pat)
+;;           | (PSymb Symbol)
 ;; type Lit  = Boolean
 ;;           | Character
 ;;           | Integer
@@ -75,3 +76,4 @@
 (struct PBox  (p)          #:prefab)
 (struct PCons (p1 p2)      #:prefab)
 (struct PAnd  (p1 p2)      #:prefab)
+(struct PSymb (s)          #:prefab)

langs/mountebank/compile-literals.rkt

@@ -79,6 +79,21 @@
      (append (literals-e e1) (append-map literals-e es))]
     [(Lam f xs e)
      (literals-e e)]
+    [(Match e ps es)
+     (append (literals-e e) (append-map literals-match-clause ps es))]
+    [_ '()]))
+
+;; Pat Expr -> [Listof Symbol]
+(define (literals-match-clause p e)
+  (append (literals-pat p) (literals-e e)))
+
+;; Pat -> [Listof Symbol]
+(define (literals-pat p)
+  (match p
+    [(PSymb s) (list s)]
+    [(PBox p) (literals-pat p)]
+    [(PCons p1 p2) (append (literals-pat p1) (literals-pat p2))]
+    [(PAnd p1 p2) (append (literals-pat p1) (literals-pat p2))]
     [_ '()]))
 
 ;; Datum -> [Listof (U Symbol String)]

langs/mountebank/test/test-runner.rkt

@@ -308,6 +308,8 @@
   (check-equal? (run '(string? (symbol->string 'foo))) #t)
   (check-equal? (run '(eq? (symbol->string 'foo) "foo")) #f)
   (check-equal? (run ''foo) 'foo)
+  (check-equal? (run '(eq? (match #t [_ "foo"]) "bar")) #f)
+  (check-equal? (run '(eq? (match #t [_ 'foo]) 'bar)) #f)
 
   ;; Mountebank examples  
   (check-equal? (run '#())

langs/mug/ast.rkt

@@ -47,6 +47,7 @@
 ;;           | (PBox Pat)
 ;;           | (PCons Pat Pat)
 ;;           | (PAnd Pat Pat)
+;;           | (PSymb Symbol)
 ;; type Lit  = Boolean
 ;;           | Character
 ;;           | Integer
@@ -77,3 +78,4 @@
 (struct PBox  (p)          #:prefab)
 (struct PCons (p1 p2)      #:prefab)
 (struct PAnd  (p1 p2)      #:prefab)
+(struct PSymb (s)          #:prefab)

langs/mug/compile-literals.rkt

@@ -80,6 +80,8 @@
      (append (literals-e e1) (append-map literals-e es))]
     [(Lam f xs e)
      (literals-e e)]
+    [(Match e ps es)
+     (append (literals-e e) (append-map literals-match-clause ps es))]
     [_ '()]))
 
 ;; [Listof Char] -> Asm
@@ -89,3 +91,16 @@
     [(cons c cs)
      (seq (Dd (char->integer c))
           (compile-string-chars cs))]))
+
+;; Pat Expr -> [Listof Symbol]
+(define (literals-match-clause p e)
+  (append (literals-pat p) (literals-e e)))
+
+;; Pat -> [Listof Symbol]
+(define (literals-pat p)
+  (match p
+    [(PSymb s) (list s)]
+    [(PBox p) (literals-pat p)]
+    [(PCons p1 p2) (append (literals-pat p1) (literals-pat p2))]
+    [(PAnd p1 p2) (append (literals-pat p1) (literals-pat p2))]
+    [_ '()]))

langs/mug/test/test-runner.rkt

@@ -307,7 +307,9 @@
   (check-equal? (run '(eq? (symbol->string 'foo) (symbol->string 'foo))) #f)
   (check-equal? (run '(string? (symbol->string 'foo))) #t)
   (check-equal? (run '(eq? (symbol->string 'foo) "foo")) #f)
-  (check-equal? (run ''foo) 'foo))
+  (check-equal? (run ''foo) 'foo)
+  (check-equal? (run '(eq? (match #t [_ "foo"]) "bar")) #f)
+  (check-equal? (run '(eq? (match #t [_ 'foo]) 'bar)) #f))
 
 (define (test-runner-io run)
   ;; Evildoer examples