diff --git a/collects/typed-scheme/private/infer-unit.ss b/collects/typed-scheme/private/infer-unit.ss index eb2e46cbfc..e4d9c2b2b0 100644 --- a/collects/typed-scheme/private/infer-unit.ss +++ b/collects/typed-scheme/private/infer-unit.ss @@ -353,8 +353,8 @@ (gensym dbound))] [new-tys (for/list ([var vars]) (substitute (make-F var) dbound t-dty))] - [new-cset (cgen/list V X ss (append ts new-tys))]) - (move-vars-to-dmap new-cset vars dbound))] + [new-cset (cgen/list V (append vars X) ss (append ts new-tys))]) + (move-vars-to-dmap new-cset dbound vars))] [((ValuesDots: ss s-dty dbound) (Values: ts)) (unless (>= (length ts) (length ss)) (fail! ss ts)) @@ -365,8 +365,8 @@ (gensym dbound))] [new-tys (for/list ([var vars]) (substitute (make-F var) dbound s-dty))] - [new-cset (cgen/list V X (append ss new-tys) ts)]) - (move-vars-to-dmap new-cset vars dbound))] + [new-cset (cgen/list V (append vars X) (append ss new-tys) ts)]) + (move-vars-to-dmap new-cset dbound vars))] [((ValuesDots: ss s-dty dbound) (ValuesDots: ts t-dty dbound)) (unless (= (length ss) (length ts)) (fail! ss ts)) @@ -483,4 +483,4 @@ (define (i s t r) (infer/simple (list s) (list t) r)) -;(trace cgen/arr) \ No newline at end of file +;(trace cgen/arr cgen) \ No newline at end of file diff --git a/collects/typed-scheme/values-dots-test.ss b/collects/typed-scheme/values-dots-test.ss deleted file mode 100644 index 985f298481..0000000000 --- a/collects/typed-scheme/values-dots-test.ss +++ /dev/null @@ -1,11 +0,0 @@ -#lang typed-scheme - -(require "private/extra-procs.ss") - - -(call-with-values (lambda () (values 1 2)) (lambda: ([x : Number] [y : Number]) (+ x y))) - -(#{call-with-values* @ Integer Integer Integer} (lambda () (values 1 2)) (lambda: ([x : Integer] [y : Integer]) (+ x y))) - - -(call-with-values* (lambda () (values 1 2)) (lambda: ([x : Integer] [y : Integer]) (+ x y)))