From d516bb877d8e9b581d544e3f5e1e0874f006de23 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 27 Aug 2010 13:59:39 -0400 Subject: [PATCH] Better way to setup the sandbox input. original commit: 9f540bce011106dfcda7de2c13eae3bcd3d42582 --- collects/tests/typed-scheme/optimizer/run.rkt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/collects/tests/typed-scheme/optimizer/run.rkt b/collects/tests/typed-scheme/optimizer/run.rkt index 04c337c6..0aa6d6a2 100644 --- a/collects/tests/typed-scheme/optimizer/run.rkt +++ b/collects/tests/typed-scheme/optimizer/run.rkt @@ -13,16 +13,15 @@ (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))) + ;; drop the #lang line + (let* ((prog (regexp-replace #rx"^#lang typed/(scheme|racket)(/base)?" + (file->string file) "")) + (in (if optimize? + prog + ;; drop the #:optimize + (regexp-replace #rx"#:optimize" prog ""))) + (evaluator (make-evaluator 'typed/racket in)) + (out (get-output evaluator))) (kill-evaluator evaluator) out)))))