www

commit 5c8300a538dc5f3edadb2ae4945687b5df9c8b68
parent e2b1eaa06b2c2dcc93d19bb809decedef4cc8979
Author: Ben Greenman <types@ccs.neu.edu>
Date:   Thu, 15 Oct 2015 14:08:22 -0400

[o+] check & filter functions (by arity)

Diffstat:
M
tapl/stlc+occurrence.rkt
 | 
22
++++++++++++++++++----
M
tapl/tests/stlc+occurrence-tests.rkt
 | 
61
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---

2 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/tapl/stlc+occurrence.rkt b/tapl/stlc+occurrence.rkt
@@ -48,7 +48,7 @@
     (if (null? τ*)
         #'Bot
         (τ-eval #`(∪ #,@τ*))))
-    
+
   (define (∖ τ1 τ2)
     (cond
      [(∪? τ1)
@@ -70,8 +70,19 @@
   (define τ-eval (current-type-eval))
 
   (define (τ->symbol τ)
-    ;; TODO recurse for function types
-    (cadr (syntax->datum τ)))
+    (syntax-parse τ
+     [(_ κ)
+      (syntax->datum #'κ)]
+     [(_ κ (_ () _ τ* ...))
+      (define κ-str (symbol->string (syntax->datum #'κ)))
+      (define τ-str*
+        (map (compose1 symbol->string τ->symbol) (syntax->list #'(τ* ...))))
+      (string->symbol
+       (string-append
+        (apply string-append "(" κ-str τ-str*)
+        ")"))]
+     [_
+      (error 'τ->symbol (~a (syntax->datum τ)))]))
 
   (define (∪-eval τ-stx)
     (syntax-parse (τ-eval τ-stx)
@@ -149,7 +160,7 @@
           (andmap (lambda (τ) (sub? τ τ2)) (∪->list τ1))]
          ['(#f #f)
           (sub? τ1 τ2)])))
-     
+
  (current-sub? ∪-sub?)
  (current-typecheck-relation (current-sub?))
 )
@@ -172,6 +183,9 @@
      #'number?]
     [~Nat
      #'(lambda (n) (and (integer? n) (not (negative? n))))]
+    [(~→ τ* ... τ)
+     (define k (stx-length #'(τ* ...)))
+     #`(lambda (f) (and (procedure? f) (procedure-arity-includes? f #,k #f)))]
     [_
      (error 'Π "Cannot make filter for type ~a\n" (syntax->datum τ))]))
  (define current-Π (make-parameter simple-Π)))
diff --git a/tapl/tests/stlc+occurrence-tests.rkt b/tapl/tests/stlc+occurrence-tests.rkt
@@ -270,6 +270,64 @@
             : Nat ⇒ 2)
                
 ;; -----------------------------------------------------------------------------
+;; --- Functions in union
+
+(check-type (λ ([x : (∪ Int (∪ Nat) (∪ (→ Int Int)) (→ (→ (→ Int Int)) Int))]) #t)
+            : (→ (∪ Int Nat (→ Int Int) (→ (→ (→ Int Int)) Int)) Boolean))
+
+(check-type (λ ([x : (∪ Int (→ Int Int))]) #t)
+            : (→ Int Boolean))
+
+;; --- filter functions
+(check-type
+ (λ ([x : (∪ Int (→ Int Int))])
+    (test ((→ Int Int) ? x)
+          (x 0)
+          x))
+ : (→ (∪ Int (→ Int Int)) Int))
+
+(check-type
+ (λ ([x : (∪ (→ Int Int Int) (→ Int Int))])
+    (test ((→ Int Int) ? x)
+          (x 0)
+    (test (Int ? x)
+          x
+          (x 1 0))))
+ : (→ (∪ (→ Int Int Int) (→ Int Int)) Int))
+
+(check-type-and-result
+ ((λ ([x : (∪ (→ Int Int Int) (→ Int Int) Int)])
+    (test ((→ Int Int) ? x)
+          (x 0)
+    (test (Int ? x)
+          x
+          (x 1 0)))) 1)
+ : Int ⇒ 1)
+
+(check-type-and-result
+ ((λ ([x : (∪ (→ Int Int Int) (→ Int Int) Int)])
+    (test ((→ Int Int) ? x)
+          (x 0)
+    (test (Int ? x)
+          x
+          (x 1 0)))) (λ ([y : Int]) 5))
+ : Int ⇒ 5)
+
+(check-type-and-result
+ ((λ ([x : (∪ (→ Int Int Int) (→ Int Int) Int)])
+    (test ((→ Int Int) ? x)
+          (x 0)
+    (test (Int ? x)
+          x
+          (x 1 0)))) (λ ([y : Int] [z : Int]) z))
+ : Int ⇒ 0)
+
+;; --- disallow same-arity functions
+(typecheck-fail
+ (λ ([x : (∪ (→ Int Int) (→ Str Str))]) (x 1))
+ #:with-msg "boooo")
+
+;; -----------------------------------------------------------------------------
 ;; --- TODO Filter values (should do nothing)
 
 ;; (check-type
@@ -277,8 +335,5 @@
 ;;  : Boolean)
 
 ;; -----------------------------------------------------------------------------
-;; --- TODO Filter functions
-
-;; -----------------------------------------------------------------------------
 ;; --- TODO Latent filters (on data structures)