diff --git a/collects/tests/racket/benchmarks/common/typed/cpstack-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/cpstack-non-optimizing.rkt index d53116e06c..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/cpstack-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/cpstack-non-optimizing.rkt @@ -1,2 +1 @@ - -(module cpstack-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/cpstack-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/cpstack-optimizing.rkt index 45e36f747e..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/cpstack-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/cpstack-optimizing.rkt @@ -1,2 +1 @@ - -(module cpstack-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/ctak-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/ctak-non-optimizing.rkt index be6c34e7a0..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/ctak-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/ctak-non-optimizing.rkt @@ -1,2 +1 @@ - -(module ctak-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/ctak-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/ctak-optimizing.rkt index 55746957ec..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/ctak-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/ctak-optimizing.rkt @@ -1,2 +1 @@ - -(module ctak-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/dderiv-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/dderiv-non-optimizing.rkt index b23bba64cd..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/dderiv-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/dderiv-non-optimizing.rkt @@ -1,2 +1 @@ - -(module dderiv-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/dderiv-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/dderiv-optimizing.rkt index eec89af323..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/dderiv-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/dderiv-optimizing.rkt @@ -1,2 +1 @@ - -(module dderiv-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/deriv-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/deriv-non-optimizing.rkt index a38b15fc21..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/deriv-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/deriv-non-optimizing.rkt @@ -1,2 +1 @@ - -(module deriv-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/deriv-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/deriv-optimizing.rkt index 7c7b5f9286..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/deriv-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/deriv-optimizing.rkt @@ -1,2 +1 @@ - -(module deriv-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/div-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/div-non-optimizing.rkt index 2243d51232..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/div-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/div-non-optimizing.rkt @@ -1,2 +1 @@ - -(module div-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/div-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/div-optimizing.rkt index bba73cea17..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/div-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/div-optimizing.rkt @@ -1,2 +1 @@ - -(module div-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/fft-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/fft-non-optimizing.rkt index a093cca4be..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/fft-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/fft-non-optimizing.rkt @@ -1,2 +1 @@ - -(module fft-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/fft-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/fft-optimizing.rkt index fcb7ac6739..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/fft-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/fft-optimizing.rkt @@ -1,2 +1 @@ - -(module fft-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/graphs-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/graphs-non-optimizing.rkt index 6c0f395270..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/graphs-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/graphs-non-optimizing.rkt @@ -1,2 +1 @@ - -(module graphs-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/graphs-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/graphs-optimizing.rkt index c5e66490f0..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/graphs-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/graphs-optimizing.rkt @@ -1,2 +1 @@ - -(module graphs-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/lattice2-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/lattice2-non-optimizing.rkt index f9fb825228..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/lattice2-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/lattice2-non-optimizing.rkt @@ -1,2 +1 @@ - -(module lattice2-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/lattice2-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/lattice2-optimizing.rkt index 612c5e03e5..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/lattice2-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/lattice2-optimizing.rkt @@ -1,2 +1 @@ - -(module lattice2-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/mazefun-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/mazefun-non-optimizing.rkt index 6fa46c4c9b..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/mazefun-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/mazefun-non-optimizing.rkt @@ -1,2 +1 @@ - -(module mazefun-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/mazefun-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/mazefun-optimizing.rkt index 5f7cb4a274..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/mazefun-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/mazefun-optimizing.rkt @@ -1,2 +1 @@ - -(module mazefun-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nestedloop-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nestedloop-non-optimizing.rkt index 0d9e42809a..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nestedloop-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nestedloop-non-optimizing.rkt @@ -1,2 +1 @@ - -(module nestedloop-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nestedloop-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nestedloop-optimizing.rkt index 2dae0fc562..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nestedloop-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nestedloop-optimizing.rkt @@ -1,2 +1 @@ - -(module nestedloop-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nfa-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nfa-non-optimizing.rkt index 72f75831b6..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nfa-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nfa-non-optimizing.rkt @@ -1,2 +1 @@ - -(module nfa-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nfa-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nfa-optimizing.rkt index cf5f312915..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nfa-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nfa-optimizing.rkt @@ -1,2 +1 @@ - -(module nfa-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nothing-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nothing-non-optimizing.rkt index 0b3ff32449..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nothing-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nothing-non-optimizing.rkt @@ -1,2 +1 @@ - -(module nothing-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nothing-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nothing-optimizing.rkt index f8ec47a340..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nothing-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nothing-optimizing.rkt @@ -1,2 +1 @@ - -(module nothing-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nqueens-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nqueens-non-optimizing.rkt index 4b7d7cb095..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nqueens-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nqueens-non-optimizing.rkt @@ -1,2 +1 @@ - -(module nqueens-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nqueens-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nqueens-optimizing.rkt index 6447ae9e34..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nqueens-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nqueens-optimizing.rkt @@ -1,2 +1 @@ - -(module nqueens-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nucleic3-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nucleic3-non-optimizing.rkt index a3af5a51c6..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nucleic3-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nucleic3-non-optimizing.rkt @@ -1,2 +1 @@ - -(module nucleic3-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/nucleic3-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/nucleic3-optimizing.rkt index c33ede3e31..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/nucleic3-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/nucleic3-optimizing.rkt @@ -1,2 +1 @@ - -(module nucleic3-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/paraffins-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/paraffins-non-optimizing.rkt index f8b36922d0..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/paraffins-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/paraffins-non-optimizing.rkt @@ -1,2 +1 @@ - -(module paraffins-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/paraffins-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/paraffins-optimizing.rkt index 0578093be0..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/paraffins-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/paraffins-optimizing.rkt @@ -1,2 +1 @@ - -(module paraffins-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/puzzle-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/puzzle-non-optimizing.rkt index bc35b0d4ed..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/puzzle-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/puzzle-non-optimizing.rkt @@ -1,2 +1 @@ - -(module puzzle-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/puzzle-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/puzzle-optimizing.rkt index 62bb3dc543..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/puzzle-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/puzzle-optimizing.rkt @@ -1,2 +1 @@ - -(module puzzle-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/ray-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/ray-non-optimizing.rkt index f6621f48e8..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/ray-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/ray-non-optimizing.rkt @@ -1,2 +1 @@ - -(module ray-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/ray-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/ray-optimizing.rkt index c69eeeee5b..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/ray-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/ray-optimizing.rkt @@ -1,2 +1 @@ - -(module ray-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/tak-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/tak-non-optimizing.rkt index e4fece4495..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/tak-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/tak-non-optimizing.rkt @@ -1,2 +1 @@ - -(module tak-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/tak-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/tak-optimizing.rkt index cbf206d4c9..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/tak-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/tak-optimizing.rkt @@ -1,2 +1 @@ - -(module tak-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takl-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takl-non-optimizing.rkt index 6b1b61981c..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takl-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takl-non-optimizing.rkt @@ -1,2 +1 @@ - -(module takl-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takl-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takl-optimizing.rkt index a75e50441c..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takl-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takl-optimizing.rkt @@ -1,2 +1 @@ - -(module takl-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takr-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takr-non-optimizing.rkt index f0734d8553..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takr-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takr-non-optimizing.rkt @@ -1,2 +1 @@ - -(module takr-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takr-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takr-optimizing.rkt index 3a9f2917a3..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takr-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takr-optimizing.rkt @@ -1,2 +1 @@ - -(module takr-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takr2-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takr2-non-optimizing.rkt index 44ab2d97bf..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takr2-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takr2-non-optimizing.rkt @@ -1,2 +1 @@ - -(module takr2-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/takr2-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/takr2-optimizing.rkt index 9d281ecd2e..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/takr2-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/takr2-optimizing.rkt @@ -1,2 +1 @@ - -(module takr2-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/triangle-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/triangle-non-optimizing.rkt index a9030794a0..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/triangle-non-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/triangle-non-optimizing.rkt @@ -1,2 +1 @@ - -(module triangle-non-optimizing "wrap-typed-non-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/triangle-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/triangle-optimizing.rkt index a51a90be69..76c7f4ba0a 100644 --- a/collects/tests/racket/benchmarks/common/typed/triangle-optimizing.rkt +++ b/collects/tests/racket/benchmarks/common/typed/triangle-optimizing.rkt @@ -1,2 +1 @@ - -(module triangle-optimizing "wrap-typed-optimizing.ss") +#lang s-exp "wrapper.rkt" diff --git a/collects/tests/racket/benchmarks/common/typed/wrap-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/wrap-typed-non-optimizing.rkt deleted file mode 100644 index 78d6587f37..0000000000 --- a/collects/tests/racket/benchmarks/common/typed/wrap-typed-non-optimizing.rkt +++ /dev/null @@ -1,21 +0,0 @@ - -(module wrap-typed-non-optimizing racket - (provide (rename-out (module-begin #%module-begin))) - (require (lib "include.ss")) - (require (prefix-in ts: typed/scheme/base)) - (require typed/scheme/base) - (define-syntax (module-begin stx) - (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))]) - #`(ts:#%module-begin - (ts:require/typed - "../wrap-common.rkt" - [copy-input (-> Void)] - [remove-input (-> Void)]) - (copy-input) - (include #,(format "~a.rktl" - (substring name - 0 - (caar (regexp-match-positions - #rx"-non-optimizing" - name))))) - (remove-input))))) diff --git a/collects/tests/racket/benchmarks/common/typed/wrap-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/typed/wrap-typed-optimizing.rkt deleted file mode 100644 index 1e2bbd241e..0000000000 --- a/collects/tests/racket/benchmarks/common/typed/wrap-typed-optimizing.rkt +++ /dev/null @@ -1,21 +0,0 @@ - -(module wrap-typed-optimizing racket - (provide (rename-out (module-begin #%module-begin))) - (require (lib "include.ss")) - (require (prefix-in ts: typed/scheme/base)) - (require typed/scheme/base) - (define-syntax (module-begin stx) - (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))]) - #`(ts:#%module-begin #:optimize - (ts:require/typed - "../wrap-common.rkt" - [copy-input (-> Void)] - [remove-input (-> Void)]) - (copy-input) - (include #,(format "~a.rktl" - (substring name - 0 - (caar (regexp-match-positions - #rx"-optimizing" - name))))) - (remove-input))))) diff --git a/collects/tests/racket/benchmarks/common/typed/wrapper.rkt b/collects/tests/racket/benchmarks/common/typed/wrapper.rkt new file mode 100644 index 0000000000..2625db46a1 --- /dev/null +++ b/collects/tests/racket/benchmarks/common/typed/wrapper.rkt @@ -0,0 +1,24 @@ +#lang racket/base +(provide (rename-out (module-begin #%module-begin))) +(require (prefix-in ts: typed/scheme/base) + (for-syntax racket/base (prefix-in r: typed-scheme/typed-reader)) + racket/include typed/scheme/base) + +(define-syntax (module-begin stx) + (let* ([name (symbol->string (syntax-property stx 'enclosing-module-name))] + [non-opt-re #rx"-non-optimizing"] + [opt-re #rx"-optimizing"] + [opt? (not (regexp-match non-opt-re name))] + [base-name (substring name 0 + (caar (regexp-match-positions + (if opt? opt-re non-opt-re) + name)))] + [option (if opt? (list #'#:optimize) '())] + [fname (format "~a.rktl" base-name)]) + #`(ts:#%module-begin + #,@option + (ts:require/typed + "../wrap-common.rkt" + [copy-input (-> Void)] + [remove-input (-> Void)]) + (copy-input) (include/reader #,fname r:read-syntax) (remove-input))))