From d22bf8cc112803478aa47dc8586a1f9137fe4768 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Wed, 8 Apr 2015 03:23:55 -0400 Subject: [PATCH] Fix type-name-env contracts and uses --- typed-racket-lib/typed-racket/env/type-alias-helper.rkt | 2 +- typed-racket-lib/typed-racket/env/type-name-env.rkt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/typed-racket-lib/typed-racket/env/type-alias-helper.rkt b/typed-racket-lib/typed-racket/env/type-alias-helper.rkt index 41ec8580..a1c8a8be 100644 --- a/typed-racket-lib/typed-racket/env/type-alias-helper.rkt +++ b/typed-racket-lib/typed-racket/env/type-alias-helper.rkt @@ -235,7 +235,7 @@ (register-type-name id type) (add-constant-variance! id args) (check-type-alias-contractive id type) - (values id type args))) + (values id type (map syntax-e args)))) ;; Finally, do a last pass to refine the variance (refine-variance! names-to-refine types-to-refine tvarss)) diff --git a/typed-racket-lib/typed-racket/env/type-name-env.rkt b/typed-racket-lib/typed-racket/env/type-name-env.rkt index 70424056..ce6a9c17 100644 --- a/typed-racket-lib/typed-racket/env/type-name-env.rkt +++ b/typed-racket-lib/typed-racket/env/type-name-env.rkt @@ -17,9 +17,9 @@ (-> (listof identifier?) (listof Type/c) any)] [add-alias (-> identifier? identifier? any)] [type-name-env-map - (-> (-> identifier? Type/c any) any)] + (-> (-> identifier? (or/c #t Type/c) any) any)] [type-variance-env-map - (-> (-> identifier? variance? any) any)] + (-> (-> identifier? (listof variance?) any) any)] [lookup-type-name (->* (identifier?) (procedure?) (or/c #t Type/c))] [register-type-variance!