From 714b4671e0158aa726ab099d2f95f1bc5698a9c9 Mon Sep 17 00:00:00 2001 From: Eric Dobson Date: Thu, 26 Jun 2014 09:27:47 -0700 Subject: [PATCH] Make overlap for procedures and simple data stronger. original commit: 0c187c52b70bc8a95b90b0edaaf2cb279fe3d5d5 --- .../typed-racket/types/remove-intersect.rkt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt index 3f6a6b54..9fa3dfd6 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt @@ -14,7 +14,10 @@ (boolean? v) (pair? v) (string? v) - (keyword? v))) + (keyword? v) + (char? v) + (void? v) + (eof-object? v))) (define (overlap t1 t2) @@ -79,8 +82,8 @@ (Value: (? simple-datum? v2))) (equal? v1 v2)] [(or (list (Value: (? simple-datum?)) - (or (? Struct?) (? StructTop?))) - (list (or (? Struct?) (? StructTop?)) + (or (? Struct?) (? StructTop?) (? Function?))) + (list (or (? Struct?) (? StructTop?) (? Function?)) (Value: (? simple-datum?)))) #f] [(list (Struct: n _ flds _ _ _) @@ -103,9 +106,6 @@ [(list (and t1 (Struct: _ _ _ _ _ _)) (and t2 (Struct: _ _ _ _ _ _))) (or (subtype t1 t2) (subtype t2 t1))] - [(list (== (-val eof)) - (Function: _)) - #f] [else #t])])))