suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid requiring old base-types.

Browse Source
This commit is contained in:
Sam Tobin-Hochstadt 2010-05-27 10:50:33 -04:00
parent bd0bcda85e
commit 9701ae0065
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt
View File

@ -17,7 +17,7 @@
[ns (make-base-namespace)]) [ns (make-base-namespace)])
(parameterize ([current-namespace ns]) (parameterize ([current-namespace ns])
(namespace-require 'typed-scheme/private/prims) (namespace-require 'typed-scheme/private/prims)
(namespace-require 'typed-scheme/private/base-types) (namespace-require 'typed-scheme/private/base-types-new)
(namespace-require 'typed-scheme/private/base-types-extra) (namespace-require 'typed-scheme/private/base-types-extra)
(expand 'ann-stx)))) (expand 'ann-stx))))
ty)) ty))
@ -26,7 +26,7 @@
(test-suite (test-suite
"Type Annotation tests" "Type Annotation tests"
;; FIXME - ask Ryan ;; FIXME - ask Ryan
;(tat (ann foo : Number) (ret -Number)) (tat (ann foo : Number) (ret -Number))
(tat foo #f) (tat foo #f)
(tat (ann foo : 3) (ret (-val 3) (make-NoFilter) (make-NoObject))))) (tat (ann foo : 3) (ret (-val 3) (make-NoFilter) (make-NoObject)))))

2
collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt
View File

@ -62,7 +62,6 @@
[(_ e) [(_ e)
#`(parameterize ([delay-errors? #f] #`(parameterize ([delay-errors? #f]
[current-namespace (namespace-anchor->namespace anch)] [current-namespace (namespace-anchor->namespace anch)]
[custom-printer #f]
[orig-module-stx (quote-syntax e)]) [orig-module-stx (quote-syntax e)])
(let ([ex (expand 'e)]) (let ([ex (expand 'e)])
(find-mutated-vars ex) (find-mutated-vars ex)
@ -73,7 +72,6 @@
[(_ e) [(_ e)
#`(parameterize ([delay-errors? #f] #`(parameterize ([delay-errors? #f]
[current-namespace (namespace-anchor->namespace anch)] [current-namespace (namespace-anchor->namespace anch)]
[custom-printer #f]
[orig-module-stx (quote-syntax e)]) [orig-module-stx (quote-syntax e)])
(let ([ex (expand 'e)]) (let ([ex (expand 'e)])
(find-mutated-vars ex) (find-mutated-vars ex)

2
collects/typed-scheme/private/prims.rkt
View File

@ -48,7 +48,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
(except-in mzlib/contract ->) (except-in mzlib/contract ->)
(only-in mzlib/contract [-> c->]) (only-in mzlib/contract [-> c->])
mzlib/struct mzlib/struct
"base-types.rkt" "base-types-new.rkt"
"base-types-extra.rkt") "base-types-extra.rkt")
(define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t)) (define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t))

1
collects/typed-scheme/private/with-types.rkt
View File

@ -8,7 +8,6 @@
"base-env-indexing-old.rkt" "base-env-indexing-old.rkt"
"extra-procs.rkt" "extra-procs.rkt"
"prims.rkt" "prims.rkt"
"base-types.rkt"
racket/contract/regions racket/contract/base racket/contract/regions racket/contract/base
(for-syntax (for-syntax
"base-types-extra.rkt" "base-types-extra.rkt"

2
collects/typed-scheme/typed-scheme.rkt
View File

@ -2,7 +2,7 @@
(require (rename-in "utils/utils.rkt" [infer r:infer])) (require (rename-in "utils/utils.rkt" [infer r:infer]))
(require (private base-types with-types) (require (private with-types)
(for-syntax (for-syntax
(except-in syntax/parse id) (except-in syntax/parse id)
scheme/base scheme/base