From a3d05e4cecd1d6485c87fdd81b1fe5c26a611081 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Mon, 18 May 2009 22:19:05 +0000 Subject: [PATCH] Remove tc/if-twoarm/check svn: r14860 original commit: 5f1895cfb587de8072572cdd3090db8e355a3d26 --- collects/typed-scheme/typecheck/signatures.ss | 8 ++++---- collects/typed-scheme/typecheck/tc-expr-unit.ss | 2 +- collects/typed-scheme/typecheck/tc-new-if.ss | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/collects/typed-scheme/typecheck/signatures.ss b/collects/typed-scheme/typecheck/signatures.ss index c8a5eeb5..e902aa24 100644 --- a/collects/typed-scheme/typecheck/signatures.ss +++ b/collects/typed-scheme/typecheck/signatures.ss @@ -1,6 +1,7 @@ #lang scheme/base -(require scheme/unit scheme/contract "../utils/utils.ss") -(require (rep type-rep) +(require scheme/unit scheme/contract + "../utils/utils.ss" + (rep type-rep) (utils unit-utils) (types utils)) (provide (all-defined-out)) @@ -26,8 +27,7 @@ [cnt check-subforms/with-handlers/check (syntax? tc-results? . -> . any)])) (define-signature tc-if^ - ([cnt tc/if-twoarm (syntax? syntax? syntax? . -> . tc-results?)] - [cnt tc/if-twoarm/check (syntax? syntax? syntax? tc-results? . -> . tc-results?)])) + ([cnt tc/if-twoarm ((syntax? syntax? syntax?) (tc-results?) . ->* . tc-results?)])) (define-signature tc-lambda^ ([cnt tc/lambda (syntax? syntax? syntax? . -> . tc-results?)] diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.ss b/collects/typed-scheme/typecheck/tc-expr-unit.ss index 6661dd7f..7050b5e9 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.ss +++ b/collects/typed-scheme/typecheck/tc-expr-unit.ss @@ -228,7 +228,7 @@ (begin (tc-exprs/check (syntax->list #'es) Univ) (tc-expr/check #'e expected))] ;; if - [(if tst thn els) (tc/if-twoarm/check #'tst #'thn #'els expected)] + [(if tst thn els) (tc/if-twoarm #'tst #'thn #'els expected)] ;; lambda [(#%plain-lambda formals . body) (tc/lambda/check form #'(formals) #'(body) expected)] diff --git a/collects/typed-scheme/typecheck/tc-new-if.ss b/collects/typed-scheme/typecheck/tc-new-if.ss index 6d6bc87b..09568dae 100644 --- a/collects/typed-scheme/typecheck/tc-new-if.ss +++ b/collects/typed-scheme/typecheck/tc-new-if.ss @@ -36,5 +36,3 @@ [(tc-results: t _ _) (tc-error/expr #:return (ret (or expected Err)) "Test expression expects one value, given ~a" t)])) - -(define tc/if-twoarm/check tc/if-twoarm) \ No newline at end of file