diff --git a/collects/typed-scheme/typecheck/check-subforms-unit.ss b/collects/typed-scheme/typecheck/check-subforms-unit.ss index 3dd9208d..3e93d5ea 100644 --- a/collects/typed-scheme/typecheck/check-subforms-unit.ss +++ b/collects/typed-scheme/typecheck/check-subforms-unit.ss @@ -4,7 +4,7 @@ (require syntax/kerncase scheme/match "signatures.ss" - (private type-utils type-effect-convenience union subtype) + (types utils convenience union subtype) (utils tc-utils) (rep type-rep)) @@ -18,7 +18,7 @@ (define body-ty #f) (define (get-result-ty t) (match t - [(Function: (list (arr: _ rngs #f _ '() _ _) ...)) (apply Un rngs)] + [(Function: (list (arr: _ (Values: (list (Result: rngs _ _))) #f _ '()) ...)) (apply Un rngs)] [_ (tc-error "Internal error in get-result-ty: not a function type: ~n~a" t)])) (let loop ([form form]) (parameterize ([current-orig-stx form]) diff --git a/collects/typed-scheme/typecheck/tc-let-unit.ss b/collects/typed-scheme/typecheck/tc-let-unit.ss index 9bf2bf3f..c8a3a1ce 100644 --- a/collects/typed-scheme/typecheck/tc-let-unit.ss +++ b/collects/typed-scheme/typecheck/tc-let-unit.ss @@ -2,7 +2,8 @@ (require (rename-in "../utils/utils.ss" [infer r:infer])) (require "signatures.ss" - (private type-effect-convenience type-annotation parse-type type-utils) + (types utils convenience) + (private type-annotation parse-type) (env lexical-env type-alias-env type-env) syntax/free-vars mzlib/trace