From 46b2a2113af3e6f8174379880620f7add5b0f079 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Thu, 26 Aug 2010 17:44:21 -0400 Subject: [PATCH] Use sandboxes instead of duplicate files to test results when optimizing. --- .../optimizer/generic/apply-plus.rkt | 3 +- .../optimizer/generic/begin-float.rkt | 9 +++-- .../optimizer/generic/binary-fixnum.rkt | 11 +++--- .../generic/binary-nonzero-fixnum.rkt | 7 ++-- .../typed-scheme/optimizer/generic/box.rkt | 3 +- .../optimizer/generic/dead-else.rkt | 3 +- .../optimizer/generic/dead-substructs.rkt | 3 +- .../optimizer/generic/dead-then.rkt | 3 +- .../optimizer/generic/define-begin-float.rkt | 9 +++-- .../optimizer/generic/define-call-float.rkt | 7 ++-- .../optimizer/generic/define-float.rkt | 7 ++-- .../optimizer/generic/define-pair.rkt | 7 ++-- .../optimizer/generic/different-langs.rkt | 5 ++- .../optimizer/generic/double-float.rkt | 7 ++-- .../optimizer/generic/exact-inexact.rkt | 7 ++-- .../optimizer/generic/fixnum-comparison.rkt | 7 ++-- .../optimizer/generic/float-comp.rkt | 7 ++-- .../optimizer/generic/float-fun.rkt | 12 +++--- .../optimizer/generic/float-promotion.rkt | 9 +++-- .../optimizer/generic/flvector-length.rkt | 7 ++-- .../typed-scheme/optimizer/generic/fx-fl.rkt | 7 ++-- .../optimizer/generic/in-bytes.rkt | 3 +- .../optimizer/generic/in-list.rkt | 9 +++-- .../optimizer/generic/in-string.rkt | 3 +- .../optimizer/generic/in-vector.rkt | 3 +- .../generic/inexact-complex-conjugate-top.rkt | 3 +- .../generic/inexact-complex-conjugate.rkt | 3 +- .../optimizer/generic/inexact-complex-div.rkt | 7 ++-- .../generic/inexact-complex-fixnum.rkt | 3 +- .../generic/inexact-complex-float-div.rkt | 3 +- .../generic/inexact-complex-float-mul.rkt | 3 +- .../generic/inexact-complex-float-small.rkt | 3 +- .../generic/inexact-complex-float.rkt | 3 +- .../optimizer/generic/inexact-complex-i.rkt | 3 +- .../generic/inexact-complex-integer.rkt | 3 +- .../generic/inexact-complex-mult.rkt | 7 ++-- .../generic/inexact-complex-parts.rkt | 11 +++--- .../generic/inexact-complex-parts2.rkt | 3 +- .../generic/inexact-complex-parts3.rkt | 3 +- .../optimizer/generic/inexact-complex-sin.rkt | 3 +- .../optimizer/generic/inexact-complex.rkt | 9 +++-- .../generic/invalid-binary-nonzero-fixnum.rkt | 9 +++-- .../generic/invalid-exact-inexact.rkt | 5 ++- .../optimizer/generic/invalid-float-comp.rkt | 7 ++-- .../generic/invalid-float-promotion.rkt | 5 ++- .../generic/invalid-inexact-complex-parts.rkt | 5 ++- .../generic/invalid-make-flrectangular.rkt | 5 ++- .../optimizer/generic/invalid-make-polar.rkt | 3 +- .../optimizer/generic/invalid-mpair.rkt | 3 +- .../optimizer/generic/invalid-sqrt.rkt | 5 ++- .../optimizer/generic/invalid-unboxed-let.rkt | 3 +- .../generic/invalid-unboxed-let2.rkt | 3 +- .../optimizer/generic/invalid-vector-ref.rkt | 9 +++-- .../optimizer/generic/invalid-vector-set.rkt | 9 +++-- .../optimizer/generic/known-vector-length.rkt | 7 ++-- .../optimizer/generic/let-float.rkt | 9 +++-- .../optimizer/generic/let-rhs.rkt | 3 +- .../optimizer/generic/literal-int.rkt | 3 +- .../optimizer/generic/magnitude.rkt | 3 +- .../optimizer/generic/make-flrectangular.rkt | 9 +++-- .../optimizer/generic/make-polar.rkt | 3 +- .../optimizer/generic/maybe-exact-complex.rkt | 3 +- .../typed-scheme/optimizer/generic/mpair.rkt | 3 +- .../optimizer/generic/n-ary-float.rkt | 7 ++-- .../generic/n-ary-inexact-complex.rkt | 7 ++-- .../optimizer/generic/nested-float.rkt | 7 ++-- .../optimizer/generic/nested-float2.rkt | 7 ++-- .../generic/nested-inexact-complex.rkt | 7 ++-- .../optimizer/generic/nested-let-loop.rkt | 3 +- .../optimizer/generic/nested-pair1.rkt | 7 ++-- .../optimizer/generic/nested-pair2.rkt | 7 ++-- .../optimizer/generic/nested-unboxed-let.rkt | 3 +- .../optimizer/generic/one-arg-arith.rkt | 3 +- .../optimizer/generic/pair-fun.rkt | 15 ++++---- .../typed-scheme/optimizer/generic/quote.rkt | 5 ++- .../optimizer/generic/real-part-loop.rkt | 3 +- .../optimizer/generic/simple-float.rkt | 7 ++-- .../optimizer/generic/simple-pair.rkt | 7 ++-- .../optimizer/generic/sqrt-segfault.rkt | 3 +- .../typed-scheme/optimizer/generic/sqrt.rkt | 11 +++--- .../optimizer/generic/string-length.rkt | 3 +- .../optimizer/generic/structs.rkt | 13 ++++--- .../optimizer/generic/unary-fixnum-nested.rkt | 7 ++-- .../optimizer/generic/unary-fixnum.rkt | 7 ++-- .../optimizer/generic/unary-float.rkt | 7 ++-- .../optimizer/generic/unboxed-for.rkt | 3 +- .../generic/unboxed-let-functions1.rkt | 3 +- .../generic/unboxed-let-functions2.rkt | 3 +- .../generic/unboxed-let-functions3.rkt | 3 +- .../generic/unboxed-let-functions4.rkt | 3 +- .../generic/unboxed-let-functions5.rkt | 3 +- .../generic/unboxed-let-functions6.rkt | 3 +- .../generic/unboxed-let-functions7.rkt | 3 +- .../generic/unboxed-let-functions8.rkt | 3 +- .../optimizer/generic/unboxed-let.rkt | 3 +- .../optimizer/generic/unboxed-let2.rkt | 3 +- .../optimizer/generic/unboxed-let3.rkt | 3 +- .../unboxed-letrec-syntaxes+values.rkt | 3 +- .../optimizer/generic/unboxed-letrec.rkt | 9 +++-- .../generic/unboxed-make-rectangular.rkt | 3 +- .../generic/vector-length-nested.rkt | 15 ++++---- .../optimizer/generic/vector-length.rkt | 7 ++-- .../optimizer/generic/vector-ref-set-ref.rkt | 15 ++++---- .../optimizer/generic/vector-ref.rkt | 7 ++-- .../optimizer/generic/vector-ref2.rkt | 7 ++-- .../optimizer/generic/vector-set-quote.rkt | 11 +++--- .../optimizer/generic/vector-set.rkt | 11 +++--- .../optimizer/generic/vector-set2.rkt | 7 ++-- .../typed-scheme/optimizer/generic/zero.rkt | 3 +- .../optimizer/non-optimized/apply-plus.rkt | 4 -- .../optimizer/non-optimized/begin-float.rkt | 4 -- .../optimizer/non-optimized/binary-fixnum.rkt | 5 --- .../non-optimized/binary-nonzero-fixnum.rkt | 3 -- .../optimizer/non-optimized/box.rkt | 9 ----- .../non-optimized/cross-module-struct.rkt | 5 --- .../non-optimized/cross-module-struct2.rkt | 5 --- .../optimizer/non-optimized/dead-else.rkt | 8 ---- .../non-optimized/dead-substructs.rkt | 17 --------- .../optimizer/non-optimized/dead-then.rkt | 8 ---- .../non-optimized/define-begin-float.rkt | 4 -- .../non-optimized/define-call-float.rkt | 3 -- .../optimizer/non-optimized/define-float.rkt | 3 -- .../optimizer/non-optimized/define-pair.rkt | 3 -- .../non-optimized/different-langs.rkt | 4 -- .../optimizer/non-optimized/double-float.rkt | 3 -- .../optimizer/non-optimized/exact-inexact.rkt | 3 -- .../non-optimized/fixnum-comparison.rkt | 3 -- .../optimizer/non-optimized/float-comp.rkt | 3 -- .../optimizer/non-optimized/float-fun.rkt | 5 --- .../non-optimized/float-promotion.rkt | 4 -- .../non-optimized/flvector-length.rkt | 3 -- .../optimizer/non-optimized/fx-fl.rkt | 3 -- .../optimizer/non-optimized/in-bytes.rkt | 4 -- .../optimizer/non-optimized/in-list.rkt | 4 -- .../optimizer/non-optimized/in-string.rkt | 4 -- .../optimizer/non-optimized/in-vector.rkt | 4 -- .../inexact-complex-conjugate-top.rkt | 3 -- .../inexact-complex-conjugate.rkt | 3 -- .../non-optimized/inexact-complex-div.rkt | 3 -- .../non-optimized/inexact-complex-fixnum.rkt | 3 -- .../inexact-complex-float-div.rkt | 13 ------- .../inexact-complex-float-mul.rkt | 8 ---- .../inexact-complex-float-small.rkt | 7 ---- .../non-optimized/inexact-complex-float.rkt | 6 --- .../non-optimized/inexact-complex-i.rkt | 3 -- .../non-optimized/inexact-complex-integer.rkt | 3 -- .../non-optimized/inexact-complex-mult.rkt | 3 -- .../non-optimized/inexact-complex-parts.rkt | 5 --- .../non-optimized/inexact-complex-parts2.rkt | 8 ---- .../non-optimized/inexact-complex-parts3.rkt | 8 ---- .../non-optimized/inexact-complex-sin.rkt | 5 --- .../non-optimized/inexact-complex.rkt | 4 -- .../invalid-binary-nonzero-fixnum.rkt | 4 -- .../non-optimized/invalid-exact-inexact.rkt | 2 - .../non-optimized/invalid-float-comp.rkt | 3 -- .../non-optimized/invalid-float-promotion.rkt | 2 - .../invalid-inexact-complex-parts.rkt | 2 - .../invalid-make-flrectangular.rkt | 2 - .../non-optimized/invalid-make-polar.rkt | 3 -- .../optimizer/non-optimized/invalid-mpair.rkt | 4 -- .../optimizer/non-optimized/invalid-sqrt.rkt | 2 - .../non-optimized/invalid-unboxed-let.rkt | 12 ------ .../non-optimized/invalid-unboxed-let2.rkt | 7 ---- .../non-optimized/invalid-vector-ref.rkt | 4 -- .../non-optimized/invalid-vector-set.rkt | 4 -- .../non-optimized/known-vector-length.rkt | 3 -- .../optimizer/non-optimized/let-float.rkt | 4 -- .../optimizer/non-optimized/let-rhs.rkt | 6 --- .../optimizer/non-optimized/literal-int.rkt | 6 --- .../optimizer/non-optimized/magnitude.rkt | 5 --- .../non-optimized/make-flrectangular.rkt | 4 -- .../optimizer/non-optimized/make-polar.rkt | 9 ----- .../non-optimized/maybe-exact-complex.rkt | 5 --- .../optimizer/non-optimized/mpair.rkt | 14 ------- .../optimizer/non-optimized/n-ary-float.rkt | 3 -- .../non-optimized/n-ary-inexact-complex.rkt | 3 -- .../optimizer/non-optimized/nested-float.rkt | 3 -- .../optimizer/non-optimized/nested-float2.rkt | 3 -- .../non-optimized/nested-inexact-complex.rkt | 3 -- .../non-optimized/nested-let-loop.rkt | 15 -------- .../optimizer/non-optimized/nested-pair1.rkt | 3 -- .../optimizer/non-optimized/nested-pair2.rkt | 3 -- .../non-optimized/nested-unboxed-let.rkt | 7 ---- .../optimizer/non-optimized/one-arg-arith.rkt | 20 ---------- .../optimizer/non-optimized/pair-fun.rkt | 7 ---- .../optimizer/non-optimized/quote.rkt | 2 - .../non-optimized/real-part-loop.rkt | 8 ---- .../optimizer/non-optimized/simple-float.rkt | 3 -- .../optimizer/non-optimized/simple-pair.rkt | 3 -- .../optimizer/non-optimized/sqrt-segfault.rkt | 14 ------- .../optimizer/non-optimized/sqrt.rkt | 5 --- .../optimizer/non-optimized/string-length.rkt | 6 --- .../optimizer/non-optimized/structs.rkt | 6 --- .../non-optimized/unary-fixnum-nested.rkt | 3 -- .../optimizer/non-optimized/unary-fixnum.rkt | 3 -- .../optimizer/non-optimized/unary-float.rkt | 3 -- .../optimizer/non-optimized/unboxed-for.rkt | 7 ---- .../non-optimized/unboxed-let-functions1.rkt | 7 ---- .../non-optimized/unboxed-let-functions2.rkt | 9 ----- .../non-optimized/unboxed-let-functions3.rkt | 9 ----- .../non-optimized/unboxed-let-functions4.rkt | 9 ----- .../non-optimized/unboxed-let-functions5.rkt | 10 ----- .../non-optimized/unboxed-let-functions6.rkt | 10 ----- .../non-optimized/unboxed-let-functions7.rkt | 10 ----- .../non-optimized/unboxed-let-functions8.rkt | 7 ---- .../optimizer/non-optimized/unboxed-let.rkt | 8 ---- .../optimizer/non-optimized/unboxed-let2.rkt | 7 ---- .../optimizer/non-optimized/unboxed-let3.rkt | 15 -------- .../unboxed-letrec-syntaxes+values.rkt | 7 ---- .../non-optimized/unboxed-letrec.rkt | 8 ---- .../unboxed-make-rectangular.rkt | 8 ---- .../non-optimized/vector-length-nested.rkt | 7 ---- .../optimizer/non-optimized/vector-length.rkt | 3 -- .../non-optimized/vector-ref-set-ref.rkt | 7 ---- .../optimizer/non-optimized/vector-ref.rkt | 3 -- .../optimizer/non-optimized/vector-ref2.rkt | 3 -- .../non-optimized/vector-set-quote.rkt | 5 --- .../optimizer/non-optimized/vector-set.rkt | 5 --- .../optimizer/non-optimized/vector-set2.rkt | 3 -- .../optimizer/non-optimized/zero.rkt | 4 -- collects/tests/typed-scheme/optimizer/run.rkt | 37 +++++++++++++++---- 221 files changed, 395 insertions(+), 881 deletions(-) delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/apply-plus.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/begin-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/binary-fixnum.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/binary-nonzero-fixnum.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/box.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/dead-else.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/dead-substructs.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/dead-then.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/define-begin-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/define-call-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/define-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/define-pair.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/different-langs.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/double-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/exact-inexact.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/fixnum-comparison.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/float-comp.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/float-fun.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/float-promotion.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/flvector-length.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/fx-fl.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/in-bytes.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/in-list.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/in-string.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/in-vector.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate-top.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-div.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-fixnum.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-div.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-mul.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-small.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-i.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-integer.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-mult.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts3.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-sin.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-binary-nonzero-fixnum.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-exact-inexact.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-comp.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-promotion.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-inexact-complex-parts.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-flrectangular.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-polar.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-mpair.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-sqrt.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-ref.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-set.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/known-vector-length.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/let-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/let-rhs.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/literal-int.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/magnitude.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/make-flrectangular.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/make-polar.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/maybe-exact-complex.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/mpair.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/n-ary-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/n-ary-inexact-complex.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-float2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-inexact-complex.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-let-loop.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-pair1.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-pair2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/nested-unboxed-let.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/one-arg-arith.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/pair-fun.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/quote.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/real-part-loop.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/simple-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/simple-pair.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/sqrt-segfault.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/sqrt.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/string-length.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/structs.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum-nested.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unary-float.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-for.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions1.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions3.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions4.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions5.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions6.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions7.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions8.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let3.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec-syntaxes+values.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/unboxed-make-rectangular.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-length-nested.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-length.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-ref-set-ref.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-ref.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-ref2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-set-quote.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-set.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/vector-set2.rkt delete mode 100644 collects/tests/typed-scheme/optimizer/non-optimized/zero.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt b/collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt index 800f688ec8..19479ca7bf 100644 --- a/collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt @@ -1,4 +1,5 @@ -#lang typed/racket #:optimize +#lang typed/racket +#:optimize (require racket/unsafe/ops) (apply + (map add1 (list 1 2 3))) (apply * (map add1 (list 1 2 3))) diff --git a/collects/tests/typed-scheme/optimizer/generic/begin-float.rkt b/collects/tests/typed-scheme/optimizer/generic/begin-float.rkt index a3bb961e2e..791e75b3cc 100644 --- a/collects/tests/typed-scheme/optimizer/generic/begin-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/begin-float.rkt @@ -1,4 +1,5 @@ -(module begin-float typed/scheme #:optimize - (require racket/unsafe/ops) - (begin (- 2.0 3.0) - (* 2.0 3.0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(begin (- 2.0 3.0) + (* 2.0 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt index 6c1dcba32f..3f7f72d4da 100644 --- a/collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt @@ -1,5 +1,6 @@ -(module binary-fixnum typed/scheme #:optimize - (require racket/unsafe/ops) - (: f (All (X) ((Vectorof X) -> Natural))) - (define (f v) - (bitwise-and (vector-length v) 1))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(: f (All (X) ((Vectorof X) -> Natural))) +(define (f v) + (bitwise-and (vector-length v) 1)) diff --git a/collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt index 0e5c46a638..6c82520dba 100644 --- a/collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt @@ -1,3 +1,4 @@ -(module binary-nonzero-fixnum typed/scheme #:optimize - (require racket/unsafe/ops) - (quotient (vector-length '#(1 2 3)) 2)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(quotient (vector-length '#(1 2 3)) 2) diff --git a/collects/tests/typed-scheme/optimizer/generic/box.rkt b/collects/tests/typed-scheme/optimizer/generic/box.rkt index aa6695def3..44dd0a01d5 100644 --- a/collects/tests/typed-scheme/optimizer/generic/box.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/box.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-else.rkt b/collects/tests/typed-scheme/optimizer/generic/dead-else.rkt index 6e2868efe2..9ec67d3d7c 100644 --- a/collects/tests/typed-scheme/optimizer/generic/dead-else.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/dead-else.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (display (if (number? 3) (+ 2.0 3.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt b/collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt index a01a5e5ba3..796076c48a 100644 --- a/collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize ;; originally from nucleic3 ;; cond on substructs, branches were considered dead diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-then.rkt b/collects/tests/typed-scheme/optimizer/generic/dead-then.rkt index c4ec905b2f..ddcf70e502 100644 --- a/collects/tests/typed-scheme/optimizer/generic/dead-then.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/dead-then.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (display (if (number? "eh") (+ 2.0 3.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt b/collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt index 508bd0e5a0..6c214e4b2f 100644 --- a/collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt @@ -1,4 +1,5 @@ -(module define-begin-float typed/scheme #:optimize - (require racket/unsafe/ops) - (define a (begin (display (- 2.0 3.0)) - (* 2.0 3.0)))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(define a (begin (display (- 2.0 3.0)) + (* 2.0 3.0))) diff --git a/collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt b/collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt index fe2ff165b9..0b0b311245 100644 --- a/collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt @@ -1,3 +1,4 @@ -(module define-call-float typed/scheme #:optimize - (require racket/unsafe/ops) - (define x (cons (+ 1.0 2.0) 3.0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(define x (cons (+ 1.0 2.0) 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/define-float.rkt b/collects/tests/typed-scheme/optimizer/generic/define-float.rkt index 9dfeb43100..fb4e85ecf4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/define-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/define-float.rkt @@ -1,3 +1,4 @@ -(module define-float typed/scheme #:optimize - (require racket/unsafe/ops) - (define x (+ 1.0 2.0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(define x (+ 1.0 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/define-pair.rkt b/collects/tests/typed-scheme/optimizer/generic/define-pair.rkt index ec30e20ce3..f32efdc1af 100644 --- a/collects/tests/typed-scheme/optimizer/generic/define-pair.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/define-pair.rkt @@ -1,3 +1,4 @@ -(module define-pair typed/scheme #:optimize - (require racket/unsafe/ops) - (define x (car '(1 3)))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(define x (car '(1 3))) diff --git a/collects/tests/typed-scheme/optimizer/generic/different-langs.rkt b/collects/tests/typed-scheme/optimizer/generic/different-langs.rkt index 9754b39230..2d52084c71 100644 --- a/collects/tests/typed-scheme/optimizer/generic/different-langs.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/different-langs.rkt @@ -1,4 +1,5 @@ +#lang typed/scheme +#:optimize ;; to see if the harness supports having the 2 versions of a test being ;; written in different languages -(module different-langs typed/scheme #:optimize - (+ 1 2)) +(+ 1 2) diff --git a/collects/tests/typed-scheme/optimizer/generic/double-float.rkt b/collects/tests/typed-scheme/optimizer/generic/double-float.rkt index 1d6864511b..a46f1de88e 100644 --- a/collects/tests/typed-scheme/optimizer/generic/double-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/double-float.rkt @@ -1,3 +1,4 @@ -(module double-float typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 2.0 2.0 2.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 2.0 2.0 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt index f19e381299..66b5cd34a4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt @@ -1,3 +1,4 @@ -(module exact-inexact typed/scheme #:optimize - (require racket/flonum) - (exact->inexact (expt 10 100))) ; must not be a fixnum +#lang typed/scheme +#:optimize +(require racket/flonum) +(exact->inexact (expt 10 100)) ; must not be a fixnum diff --git a/collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt b/collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt index 905b4c8be5..9f959d1212 100644 --- a/collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt @@ -1,3 +1,4 @@ -(module fixnum-comparison typed/scheme #:optimize - (require racket/unsafe/ops) - (< (vector-length '#(1 2 3)) (string-length "asdf"))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(< (vector-length '#(1 2 3)) (string-length "asdf")) diff --git a/collects/tests/typed-scheme/optimizer/generic/float-comp.rkt b/collects/tests/typed-scheme/optimizer/generic/float-comp.rkt index d644a1c9a7..2d67b7ecd0 100644 --- a/collects/tests/typed-scheme/optimizer/generic/float-comp.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/float-comp.rkt @@ -1,3 +1,4 @@ -(module float-comp typed/scheme #:optimize - (require racket/unsafe/ops) - (< 1.0 2.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(< 1.0 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/float-fun.rkt b/collects/tests/typed-scheme/optimizer/generic/float-fun.rkt index 788a2181ef..4aaa4a1ee3 100644 --- a/collects/tests/typed-scheme/optimizer/generic/float-fun.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/float-fun.rkt @@ -1,5 +1,7 @@ -(module float-fun typed/scheme #:optimize - (require racket/unsafe/ops) - (: f (Float -> Float)) - (define (f x) - (+ x 1.0))) +#lang typed/racket +#:optimize + +(require racket/unsafe/ops) +(: f (Float -> Float)) +(define (f x) + (+ x 1.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt b/collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt index 09d106f41b..134bd64d94 100644 --- a/collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt @@ -1,4 +1,5 @@ -(module float-promotion typed/scheme #:optimize - (require racket/unsafe/ops racket/flonum) - (+ (quotient 1 1) 2.0) - (+ (expt 100 100) 2.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops racket/flonum) +(+ (quotient 1 1) 2.0) +(+ (expt 100 100) 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt b/collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt index 34add4295a..35af6f4f56 100644 --- a/collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt @@ -1,3 +1,4 @@ -(module flvector-length typed/scheme #:optimize - (require racket/unsafe/ops racket/flonum) - (flvector-length (flvector 0.0 1.2))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops racket/flonum) +(flvector-length (flvector 0.0 1.2)) diff --git a/collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt b/collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt index ee505dfd08..f72ed808dd 100644 --- a/collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt @@ -1,3 +1,4 @@ -(module fx-fl typed/scheme #:optimize - (require racket/unsafe/ops) - (exact->inexact 1)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(exact->inexact 1) diff --git a/collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt index 4abbe2949a..3ee63e3120 100644 --- a/collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (for: ((i : Integer #"123")) (display i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/in-list.rkt b/collects/tests/typed-scheme/optimizer/generic/in-list.rkt index 6d9dde8301..4aec40c840 100644 --- a/collects/tests/typed-scheme/optimizer/generic/in-list.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/in-list.rkt @@ -1,4 +1,5 @@ -(module in-list typed/scheme #:optimize - (require racket/unsafe/ops) - (for: ((i : Natural '(1 2 3))) - (display i))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(for: ((i : Natural '(1 2 3))) + (display i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/in-string.rkt b/collects/tests/typed-scheme/optimizer/generic/in-string.rkt index 5a17acc3b6..4b0bc6f2e0 100644 --- a/collects/tests/typed-scheme/optimizer/generic/in-string.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/in-string.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (for: ((i : Char "123")) (display i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/in-vector.rkt b/collects/tests/typed-scheme/optimizer/generic/in-vector.rkt index 6cddafcf32..c86d3f328f 100644 --- a/collects/tests/typed-scheme/optimizer/generic/in-vector.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/in-vector.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (for: ((i : Integer (vector 1 2 3))) (display i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt index 3e9b409079..98896f9b74 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (conjugate (+ 1.0+2.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate.rkt index 9c647f6ab6..d0f25f4dae 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-div.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-div.rkt index dcdf6d5754..f716af05a5 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-div.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-div.rkt @@ -1,3 +1,4 @@ -(module inexact-complex-div typed/scheme #:optimize - (require racket/unsafe/ops) - (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt index 796242a912..11a6366761 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (+ (quotient 2 1) 1.0+2.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-div.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-div.rkt index a81a147cb9..e94bcb1bf0 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-div.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-div.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (map (lambda: ((x : Inexact-Complex)) (string-append (real->decimal-string (real-part x) 10) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-mul.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-mul.rkt index cc5e3c899f..7dc131755a 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-mul.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-mul.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (* 1.0 2.0+4.0i) (* 1.0+2.0i 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-small.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-small.rkt index 919c985750..dddbbcee41 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-small.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float-small.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (+ 1.0+2.0i 3.0) (+ 1.0 2.0+4.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float.rkt index bb13749a32..8c0e9080e0 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-float.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (+ 1.0+2.0i 2.0 3.0+6.0i) (- 1.0 2.0+4.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-i.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-i.rkt index 95f0b4cb88..6b8adae5f1 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-i.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-i.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (+ 1.0+2.0i (* +1.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-integer.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-integer.rkt index 9d85760b13..55caa0bf24 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-integer.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-integer.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops racket/flonum) (+ (expt 2 100) 1.0+2.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-mult.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-mult.rkt index b47c9410bb..5d31dfd8cd 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-mult.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-mult.rkt @@ -1,3 +1,4 @@ -(module inexact-complex-mult typed/scheme #:optimize - (require racket/unsafe/ops) - (* 1.0+2.0i 2.0+4.0i 3.0+6.0i)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(* 1.0+2.0i 2.0+4.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts.rkt index b07f7efafe..8bf303f850 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts.rkt @@ -1,5 +1,6 @@ -(module inexact-complex-parts typed/scheme #:optimize - (require racket/unsafe/ops) - (real-part 1.0+2.0i) - (imag-part 1+2.0i) - (real-part 1.0+2i)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(real-part 1.0+2.0i) +(imag-part 1+2.0i) +(real-part 1.0+2i) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts2.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts2.rkt index 967922d374..67c4d048e9 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts2.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts3.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts3.rkt index f953dd88ce..4c681aa140 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts3.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-parts3.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-sin.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-sin.rkt index 144f45a9d7..04a96f727f 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-sin.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-sin.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) ((lambda: ((t : Integer)) (+ (sin (* t 6.28)) 0.0+0.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex.rkt index f2e40d767a..ba1f440693 100644 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/inexact-complex.rkt @@ -1,4 +1,5 @@ -(module inexact-complex typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 1.0+2.0i 2.0+4.0i) - (- 1.0+2.0i 2.0+4.0i)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 1.0+2.0i 2.0+4.0i) +(- 1.0+2.0i 2.0+4.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt index e1e94c4706..389c47d44e 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt @@ -1,4 +1,5 @@ -(module invalid-binary-nonzero-fixnum typed/scheme #:optimize - (: f ( -> Void)) - (define (f) ; in a function, to prevent evaluation - (display (quotient 4 0)))) ; 2 fixnums, but the second is 0, cannot optimize +#lang typed/scheme +#:optimize +(: f ( -> Void)) +(define (f) ; in a function, to prevent evaluation + (display (quotient 4 0))) ; 2 fixnums, but the second is 0, cannot optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt index f0fec02575..be9df5ae66 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt @@ -1,2 +1,3 @@ -(module exact-inexact typed/scheme #:optimize - (exact->inexact 1.0)) ; not an integer, can't optimize +#lang typed/scheme +#:optimize +(exact->inexact 1.0) ; not an integer, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt index 1f972d6b67..058e956851 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt @@ -1,3 +1,4 @@ -(module float-comp typed/scheme #:optimize - (require racket/unsafe/ops) - (< 1.0 2)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(< 1.0 2) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt index 169909bef6..ef72d390a1 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt @@ -1,2 +1,3 @@ -(module float-promotion typed/scheme #:optimize - (/ 1 2.0)) ; result is not a float, can't optimize +#lang typed/scheme +#:optimize +(/ 1 2.0) ; result is not a float, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt index b0a2ab9d83..6a3345d379 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt @@ -1,2 +1,3 @@ -(module invalid-inexact-complex-parts.rkt typed/scheme #:optimize - (real-part 1+2i)) +#lang typed/scheme +#:optimize +(real-part 1+2i) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt index ce1661517c..45995fcce6 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt @@ -1,2 +1,3 @@ -(module invalid-make-flrectangular typed/scheme #:optimize - (make-rectangular 1 2)) +#lang typed/scheme +#:optimize +(make-rectangular 1 2) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt index f6a646b6df..cd94a75868 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt @@ -1,3 +1,4 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (make-polar 0 0) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt index a7a745116c..54fd281b66 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (: f ((MListof Integer) -> Integer)) (define (f x) (mcar x)) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt index 39b0336c6e..bd4182fa8b 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt @@ -1,2 +1,3 @@ -(module invalid-sqrt typed/scheme #:optimize - (sqrt -2.0)) ; not a nonnegative flonum, can't optimize +#lang typed/scheme +#:optimize +(sqrt -2.0) ; not a nonnegative flonum, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt index 4039f652c7..532ea42639 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt index f41ef094ca..2d4b614418 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt index 7471440524..d0a39f0486 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt @@ -1,4 +1,5 @@ -(module invalid-vector-ref typed/scheme #:optimize - (: f ((Vectorof Integer) -> Integer)) - (define (f x) - (vector-ref x 0))) ; type is (Vectorof Integer), length is unknown, can't optimize +#lang typed/scheme +#:optimize +(: f ((Vectorof Integer) -> Integer)) +(define (f x) + (vector-ref x 0)) ; type is (Vectorof Integer), length is unknown, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt index b02fbdc011..391b1940c4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt @@ -1,4 +1,5 @@ -(module invalid-vector-set typed/scheme #:optimize - (: f ((Vectorof Integer) -> Void)) - (define (f x) - (vector-set! x 0 2))) ; type is (Vectorof Integer), length is ot known, can't optimize +#lang typed/scheme +#:optimize +(: f ((Vectorof Integer) -> Void)) +(define (f x) + (vector-set! x 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt b/collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt index 083d8730f1..084836372d 100644 --- a/collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt @@ -1,3 +1,4 @@ -(module known-vector-length typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer))))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) diff --git a/collects/tests/typed-scheme/optimizer/generic/let-float.rkt b/collects/tests/typed-scheme/optimizer/generic/let-float.rkt index 98e6a9fe1a..bfc23b141b 100644 --- a/collects/tests/typed-scheme/optimizer/generic/let-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/let-float.rkt @@ -1,4 +1,5 @@ -(module let-float typed/scheme #:optimize - (require racket/unsafe/ops) - (let ((x (+ 3.0 2.0))) - (* 9.0 x))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(let ((x (+ 3.0 2.0))) + (* 9.0 x)) diff --git a/collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt b/collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt index e9f58d5d84..d93d5c2ad4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/literal-int.rkt b/collects/tests/typed-scheme/optimizer/generic/literal-int.rkt index 6d6d6b8a5f..8cd8fd7d92 100644 --- a/collects/tests/typed-scheme/optimizer/generic/literal-int.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/literal-int.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/magnitude.rkt b/collects/tests/typed-scheme/optimizer/generic/magnitude.rkt index aa0f1fc5b3..1ba1330b1a 100644 --- a/collects/tests/typed-scheme/optimizer/generic/magnitude.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/magnitude.rkt @@ -1,4 +1,5 @@ -#lang typed/racket/base #:optimize +#lang typed/racket/base +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt index b9250d0ea6..130f19d65d 100644 --- a/collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt @@ -1,4 +1,5 @@ -(module make-flrectangular typed/scheme #:optimize - (require racket/unsafe/ops racket/flonum) - (make-rectangular 1.0 2.2) - (make-flrectangular 1.0 2.2)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops racket/flonum) +(make-rectangular 1.0 2.2) +(make-flrectangular 1.0 2.2) diff --git a/collects/tests/typed-scheme/optimizer/generic/make-polar.rkt b/collects/tests/typed-scheme/optimizer/generic/make-polar.rkt index 137f0b17da..6916033f49 100644 --- a/collects/tests/typed-scheme/optimizer/generic/make-polar.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/make-polar.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt b/collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt index 7201c0d439..fdf7e3a6b6 100644 --- a/collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/mpair.rkt b/collects/tests/typed-scheme/optimizer/generic/mpair.rkt index 5fc67a699d..5734c82b88 100644 --- a/collects/tests/typed-scheme/optimizer/generic/mpair.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/mpair.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (: x (MPairof Integer Float)) (define x (mcons 1 1.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt b/collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt index 54b5958127..d93384bed3 100644 --- a/collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt @@ -1,3 +1,4 @@ -(module n-ary-float typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 1.0 2.0 3.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 1.0 2.0 3.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/n-ary-inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/generic/n-ary-inexact-complex.rkt index 1116e006c5..6ab5e23fca 100644 --- a/collects/tests/typed-scheme/optimizer/generic/n-ary-inexact-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/n-ary-inexact-complex.rkt @@ -1,3 +1,4 @@ -(module n-ary-inexact-complex typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-float.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-float.rkt index 04950423fe..290db71b28 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-float.rkt @@ -1,3 +1,4 @@ -(module nested-float typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 2.0 (+ 3.0 4.0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 2.0 (+ 3.0 4.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt index ebe30a18cf..ec44730aac 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt @@ -1,3 +1,4 @@ -(module nested-float typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 2.0 (* 3.0 4.0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 2.0 (* 3.0 4.0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-inexact-complex.rkt index 710d09c07c..82f8e04d0b 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-inexact-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-inexact-complex.rkt @@ -1,3 +1,4 @@ -(module nested-inexact-complex typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt index a63ed243a3..0a8dfc638a 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt index 744d0c8351..bfe2d3c395 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt @@ -1,3 +1,4 @@ -(module nested-pair typed/scheme #:optimize - (require racket/unsafe/ops) - (car (cdr '(1 2)))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(car (cdr '(1 2))) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt index a4c429d108..15baf31457 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt @@ -1,3 +1,4 @@ -(module nested-pair2 typed/scheme #:optimize - (require racket/unsafe/ops) - (car (cdr (cons 3 (cons (cons 2 '()) 1))))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(car (cdr (cons 3 (cons (cons 2 '()) 1)))) diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt index c16bdebb38..9d1529e4b9 100644 --- a/collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt b/collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt index 990036e420..686ca154e5 100644 --- a/collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt b/collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt index 2fea5497ac..505f290c98 100644 --- a/collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt @@ -1,7 +1,8 @@ -(module pair-fun typed/scheme #:optimize - (require racket/unsafe/ops) - (: f ((Listof Integer) -> Integer)) - (define (f x) - (if (null? x) - 1 - (car x)))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(: f ((Listof Integer) -> Integer)) +(define (f x) + (if (null? x) + 1 + (car x))) diff --git a/collects/tests/typed-scheme/optimizer/generic/quote.rkt b/collects/tests/typed-scheme/optimizer/generic/quote.rkt index 2d62416fb7..cedbcaf91f 100644 --- a/collects/tests/typed-scheme/optimizer/generic/quote.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/quote.rkt @@ -1,2 +1,3 @@ -(module quote typed/scheme #:optimize - '(+ 1.0 2.0)) +#lang typed/scheme +#:optimize +'(+ 1.0 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt b/collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt index 3b333b19da..adf87802d4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt @@ -1,4 +1,5 @@ -#lang typed/racket/base #:optimize +#lang typed/racket/base +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/simple-float.rkt b/collects/tests/typed-scheme/optimizer/generic/simple-float.rkt index 90676b7a29..850c34c989 100644 --- a/collects/tests/typed-scheme/optimizer/generic/simple-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/simple-float.rkt @@ -1,3 +1,4 @@ -(module simple-float typed/scheme #:optimize - (require racket/unsafe/ops) - (+ 2.0 3.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(+ 2.0 3.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt b/collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt index e5f69f7086..b70202837d 100644 --- a/collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt @@ -1,3 +1,4 @@ -(module simple-pair typed/scheme #:optimize - (require racket/unsafe/ops) - (car (cons 1 2))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(car (cons 1 2)) diff --git a/collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt b/collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt index 887eb62975..af42b1ff9c 100644 --- a/collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/sqrt.rkt b/collects/tests/typed-scheme/optimizer/generic/sqrt.rkt index 411ff90047..9ff52d708a 100644 --- a/collects/tests/typed-scheme/optimizer/generic/sqrt.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/sqrt.rkt @@ -1,5 +1,6 @@ -(module sqrt typed/scheme #:optimize - (require racket/unsafe/ops) - (: f (Nonnegative-Float -> Nonnegative-Float)) - (define (f x) - (sqrt x))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(: f (Nonnegative-Float -> Nonnegative-Float)) +(define (f x) + (sqrt x)) diff --git a/collects/tests/typed-scheme/optimizer/generic/string-length.rkt b/collects/tests/typed-scheme/optimizer/generic/string-length.rkt index 302101007e..b3053d0482 100644 --- a/collects/tests/typed-scheme/optimizer/generic/string-length.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/string-length.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/structs.rkt b/collects/tests/typed-scheme/optimizer/generic/structs.rkt index 4fb39c9d30..7ea3763bb6 100644 --- a/collects/tests/typed-scheme/optimizer/generic/structs.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/structs.rkt @@ -1,6 +1,7 @@ -(module structs typed/scheme #:optimize - (require racket/unsafe/ops) - (define-struct: pt ((x : Integer) (y : Integer)) #:mutable) - (define a (pt 3 4)) - (pt-x a) - (set-pt-y! a 5)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(define-struct: pt ((x : Integer) (y : Integer)) #:mutable) +(define a (pt 3 4)) +(pt-x a) +(set-pt-y! a 5) diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt b/collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt index 710197af9f..054dcc37e7 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt @@ -1,3 +1,4 @@ -(module unary-fixnum-nested typed/scheme #:optimize - (require racket/unsafe/ops racket/fixnum) - (abs (bitwise-not (length '(1 2 3))))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops racket/fixnum) +(abs (bitwise-not (length '(1 2 3)))) diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt index b9309084a7..c6183cbed4 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt @@ -1,3 +1,4 @@ -(module unary-fixnum typed/scheme #:optimize - (require racket/unsafe/ops) - (bitwise-not 4)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(bitwise-not 4) diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-float.rkt b/collects/tests/typed-scheme/optimizer/generic/unary-float.rkt index d57f3950f5..0f9075a017 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unary-float.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unary-float.rkt @@ -1,3 +1,4 @@ -(module float-unary typed/scheme #:optimize - (require racket/unsafe/ops) - (sin 2.0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(sin 2.0) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt index 24e60d244f..ebc3fc3761 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt index 2c3ec85183..ae8623a4f6 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt index 9c9238003a..1b2b401f62 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt index 9bc0f44c9a..32a0c2d8c8 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt index eef4690197..ec577333a8 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt index 7b6859422c..fb5da8d2ef 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt index b50c6e8640..31fae6f1f2 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops racket/flonum) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt index 792b46a506..b60a7eecb8 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops racket/flonum) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt index 124b4cbd37..88610a8c2e 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt index bfa8fff165..faa7be8a91 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt index f5f8c2a5bb..fc47b9a22b 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt index b52e893c8e..2ca3e9d1c2 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt index f092303116..ae3c43b471 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt index aed81a45aa..c70b05d2c9 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt @@ -1,8 +1,9 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) -(letrec ((#{f : (Any -> Any)} (lambda: ((x : Any)) (f x))) - (#{x : Inexact-Complex} 1.0+2.0i) - (#{y : Inexact-Complex} (+ 2.0+4.0i 3.0+6.0i))) +(letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) + (x : Inexact-Complex 1.0+2.0i) + (y : Inexact-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt b/collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt index 87d3f05d22..eeffd93a5b 100644 --- a/collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt index ade363e1bf..81bf26b284 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt @@ -1,7 +1,8 @@ -(module vector-length typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-length - (vector-ref - (ann (vector (vector 1 2) 2 3) - (Vector (Vectorof Integer) Integer Integer)) - 0))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-length + (vector-ref + (ann (vector (vector 1 2) 2 3) + (Vector (Vectorof Integer) Integer Integer)) + 0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-length.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-length.rkt index 51093a0955..7992fb63f6 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-length.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-length.rkt @@ -1,3 +1,4 @@ -(module vector-length typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-length (vector 1 2 3))) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-length (vector 1 2 3)) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt index 711633ea97..8833301ae8 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt @@ -1,7 +1,8 @@ -(module vector-ref-set-ref typed/scheme #:optimize - (require racket/unsafe/ops) - (: x (Vector Integer String)) - (define x (vector 1 "1")) - (vector-ref x 0) - (vector-set! x 1 "2") - (vector-ref x 1)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(: x (Vector Integer String)) +(define x (vector 1 "1")) +(vector-ref x 0) +(vector-set! x 1 "2") +(vector-ref x 1) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt index 00261f8ac9..1f149356d9 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt @@ -1,3 +1,4 @@ -(module vector-ref typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt index 434fa07c1b..e9cf5ee5f9 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt @@ -1,3 +1,4 @@ -(module vector-ref2 typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-ref (vector 1 2 3) 0)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-ref (vector 1 2 3) 0) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt index 063b78d3be..5243c3f36f 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt @@ -1,5 +1,6 @@ -(module vector-set-quote typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-set! (ann (vector '(1 2)) (Vector Any)) - 0 - '(+ 1.0 2.0))) ; we should not optimize under quote +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-set! (ann (vector '(1 2)) (Vector Any)) + 0 + '(+ 1.0 2.0)) ; we should not optimize under quote diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-set.rkt index 5f29aa5e57..d01f53c59e 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-set.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-set.rkt @@ -1,5 +1,6 @@ -(module vector-set typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-set! (ann (vector 1 2) (Vector Integer Integer)) - 0 - 1)) +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-set! (ann (vector 1 2) (Vector Integer Integer)) + 0 + 1) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt index 910575d5da..d66ff004e1 100644 --- a/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt @@ -1,3 +1,4 @@ -(module invalid-vector-set typed/scheme #:optimize - (require racket/unsafe/ops) - (vector-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize +#lang typed/scheme +#:optimize +(require racket/unsafe/ops) +(vector-set! (vector 1 2) 0 2) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/zero.rkt b/collects/tests/typed-scheme/optimizer/generic/zero.rkt index dc78943c5f..e853019b5c 100644 --- a/collects/tests/typed-scheme/optimizer/generic/zero.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/zero.rkt @@ -1,4 +1,5 @@ -#lang typed/scheme #:optimize +#lang typed/scheme +#:optimize (require racket/unsafe/ops) (zero? 1) (zero? (sqrt 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/apply-plus.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/apply-plus.rkt deleted file mode 100644 index 023842211e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/apply-plus.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/racket -(require racket/unsafe/ops) -(apply + (map add1 (list 1 2 3))) -(apply * (map add1 (list 1 2 3))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/begin-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/begin-float.rkt deleted file mode 100644 index 112c902f4e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/begin-float.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module begin-float typed/scheme - (require racket/unsafe/ops) - (begin (- 2.0 3.0) - (* 2.0 3.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/binary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/binary-fixnum.rkt deleted file mode 100644 index cf8afb4894..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/binary-fixnum.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module binary-fixnum typed/scheme - (require racket/unsafe/ops) - (: f (All (X) ((Vectorof X) -> Natural))) - (define (f v) - (bitwise-and (vector-length v) 1))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/binary-nonzero-fixnum.rkt deleted file mode 100644 index 2d6c979951..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/binary-nonzero-fixnum.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module binary-nonzero-fixnum typed/scheme - (require racket/unsafe/ops) - (quotient (vector-length '#(1 2 3)) 2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/box.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/box.rkt deleted file mode 100644 index 8c862a42ac..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/box.rkt +++ /dev/null @@ -1,9 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(: x (Boxof Integer)) -(define x (box 1)) -(unbox x) -(set-box! x 2) -(unbox x) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct.rkt deleted file mode 100644 index b684fc1443..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang typed/scheme - -;; will be imported by cross-module-struct2 -(provide (struct-out x)) -(define-struct: x ((x : Integer))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct2.rkt deleted file mode 100644 index 7148ada6af..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/cross-module-struct2.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang typed/scheme - -(require (file "cross-module-struct.rkt") racket/unsafe/ops) -(define a (make-x 1)) -(x-x a) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/dead-else.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/dead-else.rkt deleted file mode 100644 index 7f8f334086..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/dead-else.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(display (if (number? 3) - (+ 2.0 3.0) - (+ 4.0 5.0))) -(display (if #t - (+ 2.0 3.0) - (+ 4.0 5.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/dead-substructs.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/dead-substructs.rkt deleted file mode 100644 index ac216a0b2d..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/dead-substructs.rkt +++ /dev/null @@ -1,17 +0,0 @@ -#lang typed/scheme - -;; originally from nucleic3 -;; cond on substructs, branches were considered dead - -(define-struct: parent ((x : Integer))) -(define-struct: (child1 parent) ((y : Integer))) -(define-struct: (child2 parent) ((y : Float))) - -(: f (parent -> Integer)) -(define (f x) - (cond [(child1? x) 1] - [(child2? x) 2] - [else (error "eh?")])) - -(f (make-child1 1 2)) -(f (make-child2 1 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/dead-then.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/dead-then.rkt deleted file mode 100644 index 1b83c36b7f..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/dead-then.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(display (if (number? "eh") - (+ 2.0 3.0) - (+ 4.0 5.0))) -(display (if #f - (+ 2.0 3.0) - (+ 4.0 5.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/define-begin-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/define-begin-float.rkt deleted file mode 100644 index df183d58c3..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/define-begin-float.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module define-begin-float typed/scheme - (require racket/unsafe/ops) - (define a (begin (display (- 2.0 3.0)) - (* 2.0 3.0)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/define-call-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/define-call-float.rkt deleted file mode 100644 index 4dd8793909..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/define-call-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module define-call-float typed/scheme - (require racket/unsafe/ops) - (define x (cons (+ 1.0 2.0) 3.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/define-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/define-float.rkt deleted file mode 100644 index 08a6509909..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/define-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module define-float typed/scheme - (require racket/unsafe/ops) - (define x (+ 1.0 2.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/define-pair.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/define-pair.rkt deleted file mode 100644 index 0630d7e994..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/define-pair.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module define-pair typed/scheme - (require racket/unsafe/ops) - (define x (car '(1 3)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/different-langs.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/different-langs.rkt deleted file mode 100644 index 60ac3c3e8e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/different-langs.rkt +++ /dev/null @@ -1,4 +0,0 @@ -;; to see if the harness supports having the 2 versions of a test being -;; written in different languages -(module different-langs typed/scheme - (+ 1 2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/double-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/double-float.rkt deleted file mode 100644 index 3e345b0a50..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/double-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module double-float typed/scheme - (require racket/unsafe/ops) - (+ 2.0 2.0 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/exact-inexact.rkt deleted file mode 100644 index de45b92075..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/exact-inexact.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module exact-inexact typed/scheme - (require racket/flonum) - (exact->inexact (expt 10 100))) ; must not be a fixnum diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/fixnum-comparison.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/fixnum-comparison.rkt deleted file mode 100644 index 62ec817d6d..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/fixnum-comparison.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module fixnum-comparison typed/scheme - (require racket/unsafe/ops) - (< (vector-length '#(1 2 3)) (string-length "asdf"))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/float-comp.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/float-comp.rkt deleted file mode 100644 index 0de347658e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/float-comp.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module float-comp typed/scheme - (require racket/unsafe/ops) - (< 1.0 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/float-fun.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/float-fun.rkt deleted file mode 100644 index 208fd1e855..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/float-fun.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module float-fun typed/scheme - (require racket/unsafe/ops) - (: f (Float -> Float)) - (define (f x) - (+ x 1.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/float-promotion.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/float-promotion.rkt deleted file mode 100644 index 76ac18bf81..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/float-promotion.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module float-promotion typed/scheme - (require racket/unsafe/ops racket/flonum) - (+ (quotient 1 1) 2.0) - (+ (expt 100 100) 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/flvector-length.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/flvector-length.rkt deleted file mode 100644 index d6743a26d8..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/flvector-length.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module flvector-length typed/scheme - (require racket/unsafe/ops racket/flonum) - (flvector-length (flvector 0.0 1.2))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/fx-fl.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/fx-fl.rkt deleted file mode 100644 index b8adb43394..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/fx-fl.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module fx-fl typed/scheme - (require racket/unsafe/ops) - (exact->inexact 1)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/in-bytes.rkt deleted file mode 100644 index 6b111c07fd..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/in-bytes.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(for: ((i : Integer #"123")) - (display i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/in-list.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/in-list.rkt deleted file mode 100644 index c6ab7e4dd6..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/in-list.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module in-list typed/scheme - (require racket/unsafe/ops) - (for: ((i : Natural '(1 2 3))) - (display i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/in-string.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/in-string.rkt deleted file mode 100644 index 738f7a90cd..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/in-string.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(for: ((i : Char "123")) - (display i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/in-vector.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/in-vector.rkt deleted file mode 100644 index baa03ec42e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/in-vector.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(for: ((i : Integer (vector 1 2 3))) - (display i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate-top.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate-top.rkt deleted file mode 100644 index 0d7af3618b..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate-top.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(conjugate (+ 1.0+2.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate.rkt deleted file mode 100644 index 4466ede4b0..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-conjugate.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-div.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-div.rkt deleted file mode 100644 index 7cb3393502..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-div.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module inexact-complex-div typed/scheme - (require racket/unsafe/ops) - (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-fixnum.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-fixnum.rkt deleted file mode 100644 index 051ed12280..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-fixnum.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(+ (quotient 2 1) 1.0+2.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-div.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-div.rkt deleted file mode 100644 index 9990a73c1d..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-div.rkt +++ /dev/null @@ -1,13 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(map (lambda: ((x : Inexact-Complex)) - (string-append (real->decimal-string (real-part x) 10) - (real->decimal-string (imag-part x) 10))) - (list - (/ 1.0 2.0+4.0i) - (/ 1.0+2.0i 2.0) - (/ 1.0 2.0+4.0i 3.0+6.0i) - (/ 1.0+2.0i 2.0 3.0+6.0i) - (/ 1.0+2.0i 2.0+4.0i 3.0) - (/ 1.0+2.0i 2.0 3.0) - (/ 1.0 2.0 3.0+6.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-mul.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-mul.rkt deleted file mode 100644 index 3748ea12f1..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-mul.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(* 1.0 2.0+4.0i) -(* 1.0+2.0i 2.0) -(* 1.0 2.0+4.0i 3.0+6.0i) -(* 1.0+2.0i 2.0 3.0+6.0i) -(* 1.0+2.0i 2.0+4.0i 3.0) -(* 1.0+2.0i 2.0 3.0) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-small.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-small.rkt deleted file mode 100644 index 459f5e5944..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float-small.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(+ 1.0+2.0i 3.0) -(+ 1.0 2.0+4.0i) -(- 1.0+2.0i 3.0) -(- 1.0 2.0+4.0i) -(+ 1.0+2.0i (+ 1.0 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float.rkt deleted file mode 100644 index 80b56745f7..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-float.rkt +++ /dev/null @@ -1,6 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(+ 1.0+2.0i 2.0 3.0+6.0i) -(- 1.0 2.0+4.0i 3.0+6.0i) -(- 1.0+2.0i 2.0 3.0+6.0i) -(- 1.0+2.0i 2.0+4.0i 3.0) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-i.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-i.rkt deleted file mode 100644 index d107b430d3..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-i.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(+ 1.0+2.0i (* +1.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-integer.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-integer.rkt deleted file mode 100644 index 9ea1b37fd1..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-integer.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops racket/flonum) -(+ (expt 2 100) 1.0+2.0i) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-mult.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-mult.rkt deleted file mode 100644 index c4b1345ef9..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-mult.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module inexact-complex-mult typed/scheme - (require racket/unsafe/ops) - (* 1.0+2.0i 2.0+4.0i 3.0+6.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts.rkt deleted file mode 100644 index 8bdc677ba4..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module inexact-complex-parts typed/scheme - (require racket/unsafe/ops) - (real-part 1.0+2.0i) - (imag-part 1+2.0i) - (real-part 1.0+2i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts2.rkt deleted file mode 100644 index d367a999f1..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts2.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(real-part (+ 1.0+2.0i 2.0+4.0i)) -(unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -(imag-part (+ 1.0+2.0i 2.0+4.0i)) -(unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts3.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts3.rkt deleted file mode 100644 index 0a145d0e93..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-parts3.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -(+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -(+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -(+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-sin.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-sin.rkt deleted file mode 100644 index d38cb3ae36..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex-sin.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -((lambda: ((t : Integer)) - (+ (sin (* t 6.28)) 0.0+0.0i)) - 1) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex.rkt deleted file mode 100644 index 054a5cfb1c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/inexact-complex.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module inexact-complex typed/scheme - (require racket/unsafe/ops) - (+ 1.0+2.0i 2.0+4.0i) - (- 1.0+2.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-binary-nonzero-fixnum.rkt deleted file mode 100644 index beea61974b..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-binary-nonzero-fixnum.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module invalid-binary-nonzero-fixnum typed/scheme - (: f ( -> Void)) - (define (f) ; in a function, to prevent evaluation - (display (quotient 4 0)))) ; 2 fixnums, but the second is 0, cannot optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-exact-inexact.rkt deleted file mode 100644 index c4d9900609..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-exact-inexact.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module exact-inexact typed/scheme - (exact->inexact 1.0)) ; not an integer, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-comp.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-comp.rkt deleted file mode 100644 index 829e96a7d8..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-comp.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module float-comp typed/scheme - (require racket/unsafe/ops) - (< 1.0 2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-promotion.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-promotion.rkt deleted file mode 100644 index 99b5377669..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-float-promotion.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module float-promotion typed/scheme - (/ 1 2.0)) ; result is not a float, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-inexact-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-inexact-complex-parts.rkt deleted file mode 100644 index 0bbf671e69..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-inexact-complex-parts.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module invalid-inexact-complex-parts.rkt typed/scheme - (real-part 1+2i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-flrectangular.rkt deleted file mode 100644 index ceaefa2c01..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-flrectangular.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module invalid-make-flrectangular typed/scheme - (make-rectangular 1 2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-polar.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-polar.rkt deleted file mode 100644 index 2f12c8ec0e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-make-polar.rkt +++ /dev/null @@ -1,3 +0,0 @@ -#lang typed/scheme - -(make-polar 0 0) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-mpair.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-mpair.rkt deleted file mode 100644 index fdf5c8858a..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-mpair.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -(: f ((MListof Integer) -> Integer)) -(define (f x) - (mcar x)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-sqrt.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-sqrt.rkt deleted file mode 100644 index e6a9ba7384..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-sqrt.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module invalid-sqrt typed/scheme - (sqrt -2.0)) ; not a nonnegative flonum, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let.rkt deleted file mode 100644 index cd90619076..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let.rkt +++ /dev/null @@ -1,12 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let ((t1 (+ 1.0+2.0i 2.0+4.0i)) ; can be unboxed - (t2 (+ 3.0+6.0i 4.0+8.0i)) ; can't be unboxed - (t3 1.0+2.0i) ; can't be unboxed - (t4 1)) - (display (+ t1 t1)) - (display t2) - (display t3) - (display t4)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let2.rkt deleted file mode 100644 index e06ab99184..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-unboxed-let2.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; unboxing of let bindings does not currently work with multiple values -(let-values (((t1 t2) (values (+ 1.0+2.0i 2.0+4.0i) (+ 3.0+6.0i 4.0+8.0i)))) - (+ t1 t2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-ref.rkt deleted file mode 100644 index b698ccd196..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-ref.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module invalid-vector-ref typed/scheme - (: f ((Vectorof Integer) -> Integer)) - (define (f x) - (vector-ref x 0))) ; type is (Vectorof Integer), length is unknown, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-set.rkt deleted file mode 100644 index 875b1664b1..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/invalid-vector-set.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module invalid-vector-set typed/scheme - (: f ((Vectorof Integer) -> Void)) - (define (f x) - (vector-set! x 0 2))) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/known-vector-length.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/known-vector-length.rkt deleted file mode 100644 index 56dc43d271..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/known-vector-length.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module known-vector-length typed/scheme - (require racket/unsafe/ops) - (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer))))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/let-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/let-float.rkt deleted file mode 100644 index f5ecf2dfd6..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/let-float.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module let-float typed/scheme - (require racket/unsafe/ops) - (let ((x (+ 3.0 2.0))) - (* 9.0 x))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/let-rhs.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/let-rhs.rkt deleted file mode 100644 index 93a4278e62..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/let-rhs.rkt +++ /dev/null @@ -1,6 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let ((x (+ 1.0 2.0))) - x) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/literal-int.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/literal-int.rkt deleted file mode 100644 index 6f93f3b72e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/literal-int.rkt +++ /dev/null @@ -1,6 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(+ 1 2.0) -1 diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/magnitude.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/magnitude.rkt deleted file mode 100644 index aa0f1fc5b3..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/magnitude.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang typed/racket/base #:optimize - -(require racket/unsafe/ops) - -(magnitude 3.0+4.0i) \ No newline at end of file diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/make-flrectangular.rkt deleted file mode 100644 index 3a72365ef1..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/make-flrectangular.rkt +++ /dev/null @@ -1,4 +0,0 @@ -(module make-flrectangular typed/scheme - (require racket/unsafe/ops racket/flonum) - (make-rectangular 1.0 2.2) - (make-flrectangular 1.0 2.2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/make-polar.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/make-polar.rkt deleted file mode 100644 index 4c26b974c5..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/make-polar.rkt +++ /dev/null @@ -1,9 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; top level -(make-polar 1.0 1.0) - -;; nested -(+ 1.0+2.0i (make-polar 2.0 4.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/maybe-exact-complex.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/maybe-exact-complex.rkt deleted file mode 100644 index 45d560d85e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/maybe-exact-complex.rkt +++ /dev/null @@ -1,5 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(+ 1.0+2.0i 2+4i) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/mpair.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/mpair.rkt deleted file mode 100644 index 91fb312f64..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/mpair.rkt +++ /dev/null @@ -1,14 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(: x (MPairof Integer Float)) -(define x (mcons 1 1.0)) -(mcar x) -(mcdr x) -(set-mcar! x (+ 1 2)) -(set-mcdr! x (+ 1.0 2.0)) - -(: f ((MListof Integer) -> Integer)) -(define (f x) - (if (null? x) - 0 - (mcar x))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-float.rkt deleted file mode 100644 index 94080bee95..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module n-ary-float typed/scheme - (require racket/unsafe/ops) - (+ 1.0 2.0 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-inexact-complex.rkt deleted file mode 100644 index 687f59d4d2..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/n-ary-inexact-complex.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module n-ary-inexact-complex typed/scheme - (require racket/unsafe/ops) - (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-float.rkt deleted file mode 100644 index 57fb64fae5..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module nested-float typed/scheme - (require racket/unsafe/ops) - (+ 2.0 (+ 3.0 4.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-float2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-float2.rkt deleted file mode 100644 index ce251f65eb..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-float2.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module nested-float typed/scheme - (require racket/unsafe/ops) - (+ 2.0 (* 3.0 4.0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-inexact-complex.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-inexact-complex.rkt deleted file mode 100644 index ff7aa6d3d5..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-inexact-complex.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module nested-inexact-complex typed/scheme - (require racket/unsafe/ops) - (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-let-loop.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-let-loop.rkt deleted file mode 100644 index e99f564c28..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-let-loop.rkt +++ /dev/null @@ -1,15 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let: loop1 : Inexact-Complex - ((x : (Listof Inexact-Complex) '(1.0+2.0i 2.0+4.0i)) - (r : Inexact-Complex 0.0+0.0i)) - (if (null? x) - r - (let: loop2 : Inexact-Complex - ((y : (Listof Inexact-Complex) '(3.0+6.0i 4.0+8.0i)) - (s : Inexact-Complex 0.0+0.0i)) - (if (null? y) - (loop1 (cdr x) (+ r s)) - (loop2 (cdr y) (+ s (car x) (car y))))))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair1.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair1.rkt deleted file mode 100644 index 3a9139ade5..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair1.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module nested-pair typed/scheme - (require racket/unsafe/ops) - (car (cdr '(1 2)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair2.rkt deleted file mode 100644 index 1db864f296..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-pair2.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module nested-pair2 typed/scheme - (require racket/unsafe/ops) - (car (cdr (cons 3 (cons (cons 2 '()) 1))))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/nested-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/nested-unboxed-let.rkt deleted file mode 100644 index ad913a3bed..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/nested-unboxed-let.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let ((x (+ 1.0+2.0i 2.0+3.0i))) - (let ((x (+ x 2.0+3.0i))) - (+ x 3.0+6.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/one-arg-arith.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/one-arg-arith.rkt deleted file mode 100644 index 24f6238698..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/one-arg-arith.rkt +++ /dev/null @@ -1,20 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(- 12) -(- 12.0) -(/ 4.2) - -(+ 1) -(+ 1.0) -(+ (expt 2 100)) -(* 1) -(* 1.0) -(* (expt 2 100)) -(min 1) -(min 1.0) -(min (expt 2 100)) -(max 1) -(max 1.0) -(max (expt 2 100)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/pair-fun.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/pair-fun.rkt deleted file mode 100644 index b944b1323c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/pair-fun.rkt +++ /dev/null @@ -1,7 +0,0 @@ -(module pair-fun typed/scheme - (require racket/unsafe/ops) - (: f ((Listof Integer) -> Integer)) - (define (f x) - (if (null? x) - 1 - (car x)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/quote.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/quote.rkt deleted file mode 100644 index 3533fbabc8..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/quote.rkt +++ /dev/null @@ -1,2 +0,0 @@ -(module quote typed/scheme - '(+ 1.0 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/real-part-loop.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/real-part-loop.rkt deleted file mode 100644 index fd36bf0a17..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/real-part-loop.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/racket/base - -(ann - (let loop ([v 0.0+1.0i]) - (if (> (real-part v) 70000.2) - 0 - (loop (+ v 3.6)))) - Integer) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/simple-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/simple-float.rkt deleted file mode 100644 index 6891fc6280..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/simple-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module simple-float typed/scheme - (require racket/unsafe/ops) - (+ 2.0 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/simple-pair.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/simple-pair.rkt deleted file mode 100644 index ca0d298b7f..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/simple-pair.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module simple-pair typed/scheme - (require racket/unsafe/ops) - (car (cons 1 2))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/sqrt-segfault.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/sqrt-segfault.rkt deleted file mode 100644 index 675b4dd474..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/sqrt-segfault.rkt +++ /dev/null @@ -1,14 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; from the nbody-generic benchmark. -;; the result of sqrt was an Inexact-Complex, so inexact complex opts kicked -;; in but they resulted in segfaulting code. -;; the problem was that having Float be a subtype of Inexact-Complex was wrong -;; since you can't do unsafe-flreal-part of a float - -(let* ([dx (- 0.0 0.0)] - [dist2 (* dx dx)] - [mag (assert (* dist2 (sqrt dist2)) inexact-real?)]) - (void)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/sqrt.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/sqrt.rkt deleted file mode 100644 index a7a740e79c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/sqrt.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module sqrt typed/scheme - (require racket/unsafe/ops) - (: f (Nonnegative-Float -> Nonnegative-Float)) - (define (f x) - (sqrt x))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/string-length.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/string-length.rkt deleted file mode 100644 index 6ab3f44658..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/string-length.rkt +++ /dev/null @@ -1,6 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(string-length "eh") -(bytes-length #"eh") diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/structs.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/structs.rkt deleted file mode 100644 index 864eac59b5..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/structs.rkt +++ /dev/null @@ -1,6 +0,0 @@ -(module structs typed/scheme - (require racket/unsafe/ops) - (define-struct: pt ((x : Integer) (y : Integer)) #:mutable) - (define a (pt 3 4)) - (pt-x a) - (set-pt-y! a 5)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum-nested.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum-nested.rkt deleted file mode 100644 index 152437d1e7..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum-nested.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module unary-fixnum-nested typed/scheme - (require racket/unsafe/ops racket/fixnum) - (abs (bitwise-not (length '(1 2 3))))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum.rkt deleted file mode 100644 index 969f07bf40..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unary-fixnum.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module unary-fixnum typed/scheme - (require racket/unsafe/ops) - (bitwise-not 4)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unary-float.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unary-float.rkt deleted file mode 100644 index 8dd1c5f6ba..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unary-float.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module float-unary typed/scheme - (require racket/unsafe/ops) - (sin 2.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-for.rkt deleted file mode 100644 index 04bace2629..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-for.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(for/fold: : Inexact-Complex ((sum : Inexact-Complex 0.0+0.0i)) - ((i : Inexact-Complex '(1.0+2.0i 2.0+4.0i))) - (+ i sum)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions1.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions1.rkt deleted file mode 100644 index d41228be5f..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions1.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; simple case, function with single complex arg -(let ((f (lambda: ((x : Inexact-Complex)) (+ x 3.0+6.0i)))) - (f (+ 1.0+2.0i 2.0+4.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions2.rkt deleted file mode 100644 index 6454579e6f..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions2.rkt +++ /dev/null @@ -1,9 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; function with multiple complex args -(let ((f (lambda: ((x : Inexact-Complex) (y : Inexact-Complex)) - (+ x y)))) - (f (+ 1.0+2.0i 2.0+4.0i) - 3.0+6.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions3.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions3.rkt deleted file mode 100644 index e6e2963214..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions3.rkt +++ /dev/null @@ -1,9 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; function with a mix of complex and non-complex args -(let ((f (lambda: ((x : Inexact-Complex) (y : Float)) - (+ x y)))) - (f (+ 1.0+2.0i 2.0+4.0i) - 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions4.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions4.rkt deleted file mode 100644 index d6e565f643..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions4.rkt +++ /dev/null @@ -1,9 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; function with a mix of complex and non-complex args, non-complex first -(let ((f (lambda: ((y : Float) (x : Inexact-Complex)) - (+ x y)))) - (f 3.0 - (+ 1.0+2.0i 2.0+4.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions5.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions5.rkt deleted file mode 100644 index 2c9889a60c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions5.rkt +++ /dev/null @@ -1,10 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; invalid: f "escapes", according to our analysis -(letrec: ((f : (Inexact-Complex -> Inexact-Complex) - (lambda: ((x : Inexact-Complex)) - (let: ((y : (Inexact-Complex -> Inexact-Complex) f)) - x)))) - (f (+ 1.0+2.0i 2.0+4.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions6.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions6.rkt deleted file mode 100644 index dd3b2f85c7..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions6.rkt +++ /dev/null @@ -1,10 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops racket/flonum) - -(let: loop : Inexact-Complex ((z : Inexact-Complex 0.0+0.0i) - (l : (Listof Integer) '(1 2 3))) - (if (null? l) - (+ z 0.0+1.0i) - (loop (+ z (car l)) - (cdr l)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions7.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions7.rkt deleted file mode 100644 index 54abdb1617..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions7.rkt +++ /dev/null @@ -1,10 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops racket/flonum) - -(let: loop : Inexact-Complex ((z : Inexact-Complex 0.0+0.0i) - (l : (Listof Integer) '(1 2 3))) - (if (null? l) - z ; boxed use. z should be unboxed anyway - (loop (+ z (car l)) - (cdr l)))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions8.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions8.rkt deleted file mode 100644 index 74976cd241..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let-functions8.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(letrec: ((f : (Inexact-Complex -> Inexact-Complex) (lambda (x) (+ x 2.0+4.0i))) - (g : (Inexact-Complex -> Inexact-Complex) f)) ; f escapes! can't unbox it's args - (f 1.0+2.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let.rkt deleted file mode 100644 index 64776247a0..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) - (t2 (- t1 3.0+6.0i)) - (t3 4.0+8.0i)) - (+ t2 t3)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt deleted file mode 100644 index c376151f47..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let2.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let ((t1 (+ 1.0+2.0i 2.0+4.0i)) - (t2 (+ 3.0+6.0i 4.0+8.0i))) - (+ t1 t2)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let3.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let3.rkt deleted file mode 100644 index 5c9577f4ab..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-let3.rkt +++ /dev/null @@ -1,15 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -;; both boxed and unboxed uses, we unbox anyway -;; causes unnecessary boxing/unboxing if we take a boxed path when -;; unboxing a complex literal or variable, but I expect this case -;; to be uncommon -;; by comparison, cases where we leave a result unboxed and box it -;; if needed (like here) or cases where this would unbox loop variables -;; are likely to be more common, and more interesting -(let ((x (+ 1.0+2.0i 2.0+4.0i))) - (if (even? 2) - x - (+ x 2.0+4.0i))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec-syntaxes+values.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec-syntaxes+values.rkt deleted file mode 100644 index 875cfcbfa8..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec-syntaxes+values.rkt +++ /dev/null @@ -1,7 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(letrec-syntaxes+values (((s) (syntax-rules () [(_ x) x]))) - (((x) (+ 1.0+2.0i 2.0+4.0i))) - (+ x 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec.rkt deleted file mode 100644 index f3a82c188c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-letrec.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(letrec ((#{f : (Any -> Any)} (lambda: ((x : Any)) (f x))) - (#{x : Inexact-Complex} 1.0+2.0i) - (#{y : Inexact-Complex} (+ 2.0+4.0i 3.0+6.0i))) - (+ x y)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-make-rectangular.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-make-rectangular.rkt deleted file mode 100644 index 9748b1e671..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/unboxed-make-rectangular.rkt +++ /dev/null @@ -1,8 +0,0 @@ -#lang typed/scheme - -(require racket/unsafe/ops) - -(let ((x (make-rectangular 1.0 2.0))) - (+ x 2.0+4.0i)) -(let ((x (unsafe-make-flrectangular 1.0 2.0))) - (+ x 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-length-nested.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-length-nested.rkt deleted file mode 100644 index 3b510e613e..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-length-nested.rkt +++ /dev/null @@ -1,7 +0,0 @@ -(module vector-length typed/scheme - (require racket/unsafe/ops) - (vector-length - (vector-ref - (ann (vector (vector 1 2) 2 3) - (Vector (Vectorof Integer) Integer Integer)) - 0))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-length.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-length.rkt deleted file mode 100644 index e5769add92..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-length.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module vector-length typed/scheme - (require racket/unsafe/ops) - (vector-length (vector 1 2 3))) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref-set-ref.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref-set-ref.rkt deleted file mode 100644 index 4b17c9d192..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref-set-ref.rkt +++ /dev/null @@ -1,7 +0,0 @@ -(module vector-ref-set-ref typed/scheme - (require racket/unsafe/ops) - (: x (Vector Integer String)) - (define x (vector 1 "1")) - (vector-ref x 0) - (vector-set! x 1 "2") - (vector-ref x 1)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref.rkt deleted file mode 100644 index 5416aecf1c..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module vector-ref typed/scheme - (require racket/unsafe/ops) - (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref2.rkt deleted file mode 100644 index 20b131d17d..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-ref2.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module vector-ref2 typed/scheme - (require racket/unsafe/ops) - (vector-ref (vector 1 2 3) 0)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set-quote.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-set-quote.rkt deleted file mode 100644 index a3e950f623..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set-quote.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module vector-set-quote typed/scheme - (require racket/unsafe/ops) - (vector-set! (ann (vector '(1 2)) (Vector Any)) - 0 - '(+ 1.0 2.0))) ; we should not optimize under quote diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-set.rkt deleted file mode 100644 index 430bb0ce32..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set.rkt +++ /dev/null @@ -1,5 +0,0 @@ -(module vector-set typed/scheme - (require racket/unsafe/ops) - (vector-set! (ann (vector 1 2) (Vector Integer Integer)) - 0 - 1)) diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/vector-set2.rkt deleted file mode 100644 index 92d48eee14..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/vector-set2.rkt +++ /dev/null @@ -1,3 +0,0 @@ -(module invalid-vector-set typed/scheme - (require racket/unsafe/ops) - (vector-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/non-optimized/zero.rkt b/collects/tests/typed-scheme/optimizer/non-optimized/zero.rkt deleted file mode 100644 index ed959721eb..0000000000 --- a/collects/tests/typed-scheme/optimizer/non-optimized/zero.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -(require racket/unsafe/ops) -(zero? 1) -(zero? (sqrt 3.0)) diff --git a/collects/tests/typed-scheme/optimizer/run.rkt b/collects/tests/typed-scheme/optimizer/run.rkt index d089824f30..29dd9088c0 100644 --- a/collects/tests/typed-scheme/optimizer/run.rkt +++ b/collects/tests/typed-scheme/optimizer/run.rkt @@ -1,5 +1,5 @@ #lang racket -(require racket/runtime-path) +(require racket/runtime-path racket/sandbox) ;; since Typed Scheme's optimizer does source to source transformations, ;; we compare the expansion of automatically optimized and hand optimized @@ -23,6 +23,33 @@ #'(#f #f #f (#f)))]) ; for cadddr (expand (with-input-from-file file read-syntax)))))))) + +;; the first line must be the #lang line +;; the second line must be #:optimize +(define (evaluator file #:optimize [optimize? #f]) + (call-with-trusted-sandbox-configuration + (lambda () + (parameterize ([current-load-relative-directory + (build-path here "generic")] + [sandbox-memory-limit #f] ; TR needs memory + [sandbox-output 'string] + [sandbox-namespace-specs + (list (car (sandbox-namespace-specs)) + 'typed/racket + 'typed/scheme)]) + (let* ((lines (cdr (file->lines file))) ;; drop the #lang line + (in (if optimize? + lines + (cdr lines))) ;; drop the #:optimize + (evaluator + (make-evaluator 'typed/racket + (foldl (lambda (acc new) + (string-append new "\n" acc)) + "" in))) + (out (get-output evaluator))) + (kill-evaluator evaluator) + out))))) + (define (test gen) (let-values (((base name _) (split-path gen))) (or (regexp-match ".*~" name) ; we ignore backup files @@ -39,13 +66,7 @@ #f)) ;; optimized and non-optimized versions must evaluate to the ;; same thing - (or (equal? (with-output-to-string - (lambda () - (dynamic-require gen #f))) - (with-output-to-string - (lambda () - (let ((non-opt-dir (build-path here "non-optimized"))) - (dynamic-require (build-path non-opt-dir name) #f))))) + (or (equal? (evaluator gen) (evaluator gen #:optimize #t)) (begin (printf "~a failed: result mismatch\n\n" name) #f))))))