diff --git a/collects/tests/typed-scheme/succeed/apply-dots.ss b/collects/tests/typed-scheme/succeed/apply-dots.ss index 4d13e0d986..d7ad17a005 100644 --- a/collects/tests/typed-scheme/succeed/apply-dots.ss +++ b/collects/tests/typed-scheme/succeed/apply-dots.ss @@ -5,53 +5,53 @@ 1 w)) (plambda: (a ...) ([z : String] . [w : Number ... a]) - (apply (lambda: ([x : Number] . [y : Number]) x) + (apply (lambda: ([x : Number] . [y : Number *]) x) 1 w)) -(plambda: (a ...) ([z : String] . [w : Number]) - (apply (lambda: ([x : Number] . [y : Number]) x) +(plambda: (a ...) ([z : String] . [w : Number *]) + (apply (lambda: ([x : Number] . [y : Number *]) x) 1 w)) -(plambda: (a ...) ([z : String] . [w : Number]) +(plambda: (a ...) ([z : String] . [w : Number *]) (apply (case-lambda: (([x : Number] . [y : Number ... a]) x) - (([x : String] [y : String] . [z : String]) 0) - ([y : Number] 0)) + (([x : String] [y : String] . [z : String *]) 0) + ([y : Number *] 0)) w)) ;; */*/poly -(plambda: (a ...) ([z : String] . [w : Number]) - (apply (plambda: (b) ([x : b] . [y : Number]) x) +(plambda: (a ...) ([z : String] . [w : Number *]) + (apply (plambda: (b) ([x : b] . [y : Number *]) x) 1 w)) -(plambda: (a ...) ([z : String] . [w : Number]) - (apply (plambda: (b) ([x : b] . [y : Number]) x) +(plambda: (a ...) ([z : String] . [w : Number *]) + (apply (plambda: (b) ([x : b] . [y : Number *]) x) 1 2 3 w)) ;; */*/polydots -(plambda: (a ...) ([z : String] . [w : Number]) - (apply (plambda: (b ...) ([x : Number] . [y : Number]) x) +(plambda: (a ...) ([z : String] . [w : Number *]) + (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x) 1 w)) -(plambda: (a ...) ([z : String] . [w : Number]) - (apply (plambda: (b ...) ([x : Number] . [y : Number]) x) +(plambda: (a ...) ([z : String] . [w : Number *]) + (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x) 1 1 1 w)) ;; */.../poly (plambda: (a ...) ([z : String] . [w : Number ... a]) - (apply (plambda: (b) ([x : Number] . [y : Number]) x) + (apply (plambda: (b) ([x : Number] . [y : Number *]) x) 1 w)) (plambda: (a ...) ([z : String] . [w : Number ... a]) - (apply (plambda: (b) ([x : Number] . [y : Number]) x) + (apply (plambda: (b) ([x : Number] . [y : Number *]) x) 1 1 1 1 w)) ;; */.../polydots #;(plambda: (a ...) ([z : String] . [w : Number ... a]) - (apply (plambda: (b ...) ([x : Number] . [y : Number]) x) + (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x) 1 w)) #;(plambda: (a ...) ([z : String] . [w : Number ... a]) - (apply (plambda: (b ...) ([x : Number] . [y : Number]) x) + (apply (plambda: (b ...) ([x : Number] . [y : Number *]) x) 1 1 1 1 w)) ;; .../.../poly diff --git a/collects/tests/typed-scheme/succeed/leftist-heap.ss b/collects/tests/typed-scheme/succeed/leftist-heap.ss index 81651f7c45..da493318be 100644 --- a/collects/tests/typed-scheme/succeed/leftist-heap.ss +++ b/collects/tests/typed-scheme/succeed/leftist-heap.ss @@ -205,7 +205,7 @@ s)) 0 h))) - (pdefine: (a) (-heap . [xs : a]) : (Heap a) + (pdefine: (a) (-heap . [xs : a *]) : (Heap a) (list->heap xs)) diff --git a/collects/tests/typed-scheme/succeed/random-bits.ss b/collects/tests/typed-scheme/succeed/random-bits.ss index f926e07ff5..7d0c8b9a20 100644 --- a/collects/tests/typed-scheme/succeed/random-bits.ss +++ b/collects/tests/typed-scheme/succeed/random-bits.ss @@ -564,7 +564,7 @@ (mrg32k3a-random-integer state n)) (else (mrg32k3a-random-large state n))))) - (lambda: [args : Nb] + (lambda: [args : Nb *] (cond ((null? args) (lambda () @@ -603,7 +603,7 @@ (define: (random-source-make-integers [s : Random]): (Nb -> Nb) ((:random-source-make-integers s))) -(define: (random-source-make-reals [s : Random] . [unit : Nb]) : ( -> Flt) +(define: (random-source-make-reals [s : Random] . [unit : Nb *]) : ( -> Flt) (apply (:random-source-make-reals s) unit)) ; --- diff --git a/collects/tests/typed-scheme/succeed/varargs-tests.ss b/collects/tests/typed-scheme/succeed/varargs-tests.ss index 2bb528aac2..ccf4ec59e3 100644 --- a/collects/tests/typed-scheme/succeed/varargs-tests.ss +++ b/collects/tests/typed-scheme/succeed/varargs-tests.ss @@ -18,14 +18,14 @@ (define: f : (number boolean * -> number) - (lambda: ([x : number] . [y : boolean]) + (lambda: ([x : number] . [y : boolean *]) (if (and (pair? y) (car y)) x (- x)))) (define: f-cl : (number boolean * -> number) - (case-lambda: [([x : number] . [y : boolean]) + (case-lambda: [([x : number] . [y : boolean *]) (if (and (pair? y) (car y)) x (- x))])) -(define: (f* [x : number] . [y : boolean]) : number +(define: (f* [x : number] . [y : boolean *]) : number (if (and (pair? y) (car y)) x (- x))) (f 3) diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss b/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss index 80afadc0bb..6036a47d94 100644 --- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss +++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.ss @@ -157,17 +157,17 @@ (cond [(pair? x) 1] [(null? x) 1])) -Integer] - [tc-e (lambda: ([x : Number] . [y : Number]) (car y)) (->* (list N) N N)] - [tc-e ((lambda: ([x : Number] . [y : Number]) (car y)) 3) N] - [tc-e ((lambda: ([x : Number] . [y : Number]) (car y)) 3 4 5) N] - [tc-e ((lambda: ([x : Number] . [y : Number]) (car y)) 3 4) N] - [tc-e (apply (lambda: ([x : Number] . [y : Number]) (car y)) 3 '(4)) N] - [tc-e (apply (lambda: ([x : Number] . [y : Number]) (car y)) 3 '(4 6 7)) N] - [tc-e (apply (lambda: ([x : Number] . [y : Number]) (car y)) 3 '()) N] + [tc-e (lambda: ([x : Number] . [y : Number *]) (car y)) (->* (list N) N N)] + [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3) N] + [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3 4 5) N] + [tc-e ((lambda: ([x : Number] . [y : Number *]) (car y)) 3 4) N] + [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '(4)) N] + [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '(4 6 7)) N] + [tc-e (apply (lambda: ([x : Number] . [y : Number *]) (car y)) 3 '()) N] - [tc-e (lambda: ([x : Number] . [y : Boolean]) (car y)) (->* (list N) B B)] - [tc-e ((lambda: ([x : Number] . [y : Boolean]) (car y)) 3) B] - [tc-e (apply (lambda: ([x : Number] . [y : Boolean]) (car y)) 3 '(#f)) B] + [tc-e (lambda: ([x : Number] . [y : Boolean *]) (car y)) (->* (list N) B B)] + [tc-e ((lambda: ([x : Number] . [y : Boolean *]) (car y)) 3) B] + [tc-e (apply (lambda: ([x : Number] . [y : Boolean *]) (car y)) 3 '(#f)) B] [tc-e (let: ([x : Number 3]) (when (number? x) #t)) @@ -222,7 +222,7 @@ (string-append "foo" (a v)))) -String] - [tc-e (apply (plambda: (a) [x : a] x) '(5)) (-lst -Integer)] + [tc-e (apply (plambda: (a) [x : a *] x) '(5)) (-lst -Integer)] [tc-e (apply append (list '(1 2 3) '(4 5 6))) (-lst -Integer)] [tc-err ((case-lambda: [([x : Number]) x] @@ -471,7 +471,7 @@ ;; testing some primitives [tc-e (let ([app apply] - [f (lambda: [x : Number] 3)]) + [f (lambda: [x : Number *] 3)]) (app f (list 1 2 3))) -Integer] [tc-e ((lambda () (call/cc (lambda: ([k : (Number -> (U))]) (if (read) 5 (k 10)))))) @@ -527,7 +527,7 @@ 1)] [tc-e ((case-lambda: - [[x : Number] (+ 1 (car x))]) + [[x : Number *] (+ 1 (car x))]) 5) N] #;