From b1a49470eeaae287a8b2754308c476c3257434af Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Mon, 10 May 2010 11:51:18 -0400 Subject: [PATCH] fix `implied-atomic?' --- collects/tests/typed-scheme/succeed/simple-occurr.rkt | 2 +- collects/typed-scheme/typecheck/tc-app.rkt | 2 +- collects/typed-scheme/types/filter-ops.rkt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collects/tests/typed-scheme/succeed/simple-occurr.rkt b/collects/tests/typed-scheme/succeed/simple-occurr.rkt index e8d9b931be..72eb125023 100644 --- a/collects/tests/typed-scheme/succeed/simple-occurr.rkt +++ b/collects/tests/typed-scheme/succeed/simple-occurr.rkt @@ -1,4 +1,4 @@ -#lang typed/scheme +#lang typed/racket (: x (U #f Number)) (define x 7) diff --git a/collects/typed-scheme/typecheck/tc-app.rkt b/collects/typed-scheme/typecheck/tc-app.rkt index 811a2d4f69..cfe72ae983 100644 --- a/collects/typed-scheme/typecheck/tc-app.rkt +++ b/collects/typed-scheme/typecheck/tc-app.rkt @@ -5,7 +5,7 @@ "tc-app-helper.rkt" "find-annotation.rkt" "tc-subst.rkt" syntax/parse scheme/match mzlib/trace scheme/list - unstable/sequence + unstable/sequence unstable/debug ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy scheme/bool (only-in racket/private/class-internal make-object do-make-object) diff --git a/collects/typed-scheme/types/filter-ops.rkt b/collects/typed-scheme/types/filter-ops.rkt index 2e677929a5..7122438ca8 100644 --- a/collects/typed-scheme/types/filter-ops.rkt +++ b/collects/typed-scheme/types/filter-ops.rkt @@ -43,11 +43,11 @@ [((TypeFilter: t1 p1 i1) (TypeFilter: t2 p1 i2)) (and (name-ref=? i1 i2) - (subtype t1 t2))] + (subtype t2 t1))] [((NotTypeFilter: t2 p1 i2) (NotTypeFilter: t1 p1 i1)) (and (name-ref=? i1 i2) - (subtype t1 t2))] + (subtype t2 t1))] [(_ _) #f]))) (define (hash-name-ref i)