From 9e17eab6d8d9eed5ff9f8f6697d0618e84e0380b Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 8 Jan 2010 15:38:17 +0000 Subject: [PATCH] Create new `typed/test-engine' collection. Remove dependence of `typed-scheme' on `test-engine'. svn: r17567 original commit: 0d46fcb48a2865dd8bae8e229e8ffb4e3a2c9521 --- .../typed-scheme/fail/check-expect-fail.ss | 2 +- .../typed-scheme/succeed/check-expect.ss | 2 +- .../typed-scheme/private/base-special-env.ss | 34 ++----------------- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/collects/tests/typed-scheme/fail/check-expect-fail.ss b/collects/tests/typed-scheme/fail/check-expect-fail.ss index 92b38e8a..7fd3ef0c 100644 --- a/collects/tests/typed-scheme/fail/check-expect-fail.ss +++ b/collects/tests/typed-scheme/fail/check-expect-fail.ss @@ -1,6 +1,6 @@ #lang typed/scheme -(require test-engine/scheme-tests) +(require typed/test-engine/scheme-tests) (check-expect 3 (+ 1 'foo)) (test) diff --git a/collects/tests/typed-scheme/succeed/check-expect.ss b/collects/tests/typed-scheme/succeed/check-expect.ss index dddc43af..2d52564c 100644 --- a/collects/tests/typed-scheme/succeed/check-expect.ss +++ b/collects/tests/typed-scheme/succeed/check-expect.ss @@ -1,6 +1,6 @@ #lang typed/scheme -(require test-engine/scheme-tests) +(require typed/test-engine/scheme-tests) (check-expect 3 4) (test) diff --git a/collects/typed-scheme/private/base-special-env.ss b/collects/typed-scheme/private/base-special-env.ss index 187da6e5..6f41f071 100644 --- a/collects/typed-scheme/private/base-special-env.ss +++ b/collects/typed-scheme/private/base-special-env.ss @@ -10,7 +10,7 @@ (only-in scheme/match/runtime match:error) scheme/promise string-constants/string-constant - (prefix-in ce: test-engine/scheme-tests) + ;(prefix-in ce: test-engine/scheme-tests) (for-syntax scheme/base syntax/parse (utils tc-utils) @@ -76,37 +76,7 @@ (-poly (a b) (cl->* (-> (-lst a) (-val '()) (-lst a)) - (-> (-lst a) (-lst b) (-lst (*Un a b))))) - [(syntax-parse (local-expand #'(ce:test) 'expression null) - #:context #'ce:test - [(_ ce-t:id) #'ce-t]) - (-> -Void)] - - [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f) - #:literals (let when define-values) - [(define-values _ - (let ((_ _)) - (when _ - (insert-test _ (lambda () (check-values-expected _ _ _ _)))))) - #'insert-test]) - (Univ (-> Univ) . -> . -Void)] - [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f) - #:literals (let when define-values) - ;#:literal-sets (kernel-literals) - [(define-values _ - (let ((_ _)) - (when _ - (insert-test _ (lambda () (check-values-expected _ _ _ _)))))) - #'check-values-expected]) - ((-> Univ) Univ Univ Univ . -> . -Void)] - [(syntax-parse (local-expand #'(ce:check-expect 1 1) 'module #f) - #:literals (let when define-values) - ;#:literal-sets (kernel-literals) - [(define-values _ - (let ((_ (nvv _ _ builder _))) - _)) - #'builder]) - (-> Univ)]) + (-> (-lst a) (-lst b) (-lst (*Un a b))))))