diff --git a/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt index 572e9ee1..1835fe3f 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt @@ -1,12 +1,6 @@ #; ( #f line #f col #f - make-sequence - in-bytes -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch 495051) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-list.rkt b/collects/tests/typed-scheme/optimizer/tests/in-list.rkt index 28dcdd88..d32781de 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-list.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-list.rkt @@ -1,12 +1,6 @@ #; ( #f line #f col #f - make-sequence - in-list -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-string.rkt b/collects/tests/typed-scheme/optimizer/tests/in-string.rkt index 28c331de..869316f4 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-string.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-string.rkt @@ -1,12 +1,6 @@ #; ( #f line #f col #f - make-sequence - in-string -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt b/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt index 4c5e3c32..cabc9474 100644 --- a/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt @@ -1,12 +1,6 @@ #; ( #f line #f col #f - make-sequence - in-vector -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch -#f line #f col #f - op - dead else branch 123) #lang typed/scheme diff --git a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt index e76602ab..0f696ecf 100644 --- a/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt @@ -12,7 +12,6 @@ unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex unboxed-for.rkt line 51 col 31 - sum - unboxed var -> table #f line #f col #f - for-loop - unboxed function -> table #f line #f col #f - for-loop - fun -> unboxed fun -#f line #f col #f - op - dead else branch unboxed-for.rkt line 51 col 31 - sum - unboxed complex variable unboxed-for.rkt line 53 col 9 - i - unbox float-complex unboxed-for.rkt line 53 col 11 - sum - unbox float-complex @@ -20,7 +19,6 @@ unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex #f line #f col #f - (#%app pos->vals pos) - unbox float-complex #f line #f col #f - (let-values (((i) (#%app pos->vals pos))) (if (#%expression (if val-cont? (#%app val-cont? i) (quote #t))) (let-values (((sum) (let-values (((sum) sum)) (let-values () (#%app + i sum))))) (if (#%expression (if all-cont? (#%app all-cont? pos i) (quote #t))) (#%app for-loop sum (#%app pos-next pos)) sum)) sum)) - unboxed let bindings -#f line #f col #f - op - dead else branch unboxed-for.rkt line 52 col 13 - i - unboxed complex variable unboxed-for.rkt line 52 col 13 - i - unboxed complex variable unboxed-for.rkt line 53 col 9 - i - leave var unboxed @@ -33,7 +31,6 @@ unboxed-for.rkt line 53 col 9 - i - leave var unboxed unboxed-for.rkt line 53 col 11 - sum - leave var unboxed unboxed-for.rkt line 53 col 7 - + - unboxed binary float complex unboxed-for.rkt line 53 col 6 - (#%app + i sum) - unboxed float complex -#f line #f col #f - op - dead else branch unboxed-for.rkt line 52 col 13 - i - unboxed complex variable unboxed-for.rkt line 51 col 31 - sum - unbox float-complex #f line #f col #f - for-loop - unboxed call site @@ -48,6 +45,9 @@ unboxed-for.rkt line 51 col 0 - (letrec-values (((for-loop) (lambda (sum pos) (i #lang typed/scheme #:optimize + + + (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex '(1.0+2.0i 2.0+4.0i))) (+ i sum)) diff --git a/collects/typed-scheme/private/base-special-env.rkt b/collects/typed-scheme/private/base-special-env.rkt index cd1c2396..ad1aa0d2 100644 --- a/collects/typed-scheme/private/base-special-env.rkt +++ b/collects/typed-scheme/private/base-special-env.rkt @@ -59,9 +59,9 @@ (-> Univ (-values a)) (-> Univ Univ) Univ - (-> Univ Univ) - (->* a Univ) - (->* (cons Univ a) Univ))))]) + (Un (-> Univ Univ) (-val #f)) + (Un (->* a Univ) (-val #f)) + (Un (->* (cons Univ a) Univ) (-val #f)))))]) (cl->* (-> Univ (-seq a) (seq-vals (list a))) (-> Univ (-seq a b) (seq-vals (list a b))))))]