From 0b7ccf2e4bca163c554a5ec584c31a9ddbc773de Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Wed, 12 Aug 2009 21:52:21 +0000 Subject: [PATCH] fix 9967 svn: r15720 original commit: 6af7d327099ad47227a8df7e513b61e7341178a7 --- collects/typed-scheme/env/type-env.ss | 2 +- collects/typed-scheme/typecheck/tc-lambda-unit.ss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/collects/typed-scheme/env/type-env.ss b/collects/typed-scheme/env/type-env.ss index 34da01ba..496c7920 100644 --- a/collects/typed-scheme/env/type-env.ss +++ b/collects/typed-scheme/env/type-env.ss @@ -51,7 +51,7 @@ (define (finish-register-type id) (unless (maybe-finish-register-type id) - (int-err "finishing type that was already finished: ~a" (syntax-e id)))) + (tc-error/stx id "Duplicate defintion for ~a" (syntax-e id)))) (define (check-all-registered-types) (module-identifier-mapping-for-each diff --git a/collects/typed-scheme/typecheck/tc-lambda-unit.ss b/collects/typed-scheme/typecheck/tc-lambda-unit.ss index d19839a7..82064cc8 100644 --- a/collects/typed-scheme/typecheck/tc-lambda-unit.ss +++ b/collects/typed-scheme/typecheck/tc-lambda-unit.ss @@ -220,7 +220,8 @@ (match expected [(tc-result1: (Function: _)) (tc/mono-lambda/type formals bodies expected)] [(tc-result1: (or (Poly: _ _) (PolyDots: _ _))) - (tc/plambda form formals bodies expected)])) + (tc/plambda form formals bodies expected)] + [(tc-result1: (Error:)) (tc/mono-lambda/type formals bodies #f)])) (match expected [(tc-result1: (and t (Poly-names: ns expected*))) (let* ([tvars (let ([p (syntax-property form 'typechecker:plambda)])