From 7f3cf8a3ef4367dd1e3572e339c7995ffa3c4c9c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 20 Apr 2010 15:24:48 -0600 Subject: [PATCH 1/2] move most of the 'scheme' collection to the 'racket' collection original commit: c95a39875453e7f057395a7bf626e5d2ed732e7e --- collects/typed-scheme/private/base-env-indexing-abs.ss | 2 +- collects/typed-scheme/private/base-env-numeric.ss | 2 +- collects/typed-scheme/private/base-env.ss | 2 +- collects/typed-scheme/private/base-special-env.ss | 2 +- collects/typed-scheme/private/with-types.ss | 2 +- collects/typed-scheme/typecheck/provide-handling.ss | 2 +- collects/typed-scheme/typecheck/tc-app.ss | 4 ++-- collects/typed-scheme/typecheck/tc-expr-unit.ss | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/collects/typed-scheme/private/base-env-indexing-abs.ss b/collects/typed-scheme/private/base-env-indexing-abs.ss index 1676ca26..44587b1c 100644 --- a/collects/typed-scheme/private/base-env-indexing-abs.ss +++ b/collects/typed-scheme/private/base-env-indexing-abs.ss @@ -12,7 +12,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-template scheme) (rename-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Nat -Nat*])) diff --git a/collects/typed-scheme/private/base-env-numeric.ss b/collects/typed-scheme/private/base-env-numeric.ss index a7eb9b63..8790a1e8 100644 --- a/collects/typed-scheme/private/base-env-numeric.ss +++ b/collects/typed-scheme/private/base-env-numeric.ss @@ -11,7 +11,7 @@ (only-in '#%kernel [apply kernel:apply]) scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym] [-Real R] [-ExactPositiveInteger -Pos]))) (define-for-syntax all-num-types (list -Pos -Nat -Integer -ExactRational -Flonum -Real N)) diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index 959ea1fb..0cab853a 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -12,7 +12,7 @@ scheme/promise scheme/system (only-in string-constants/private/only-once maybe-print-message) (only-in mzscheme make-namespace) - (only-in scheme/match/runtime match:error matchable? match-equality-test) + (only-in racket/match/runtime match:error matchable? match-equality-test) (for-syntax (only-in (types abbrev) [-Number N] [-Boolean B] [-Symbol Sym]) (only-in (rep type-rep) make-HashtableTop make-MPairTop make-BoxTop make-VectorTop))) diff --git a/collects/typed-scheme/private/base-special-env.ss b/collects/typed-scheme/private/base-special-env.ss index b631a4d7..4ead72b0 100644 --- a/collects/typed-scheme/private/base-special-env.ss +++ b/collects/typed-scheme/private/base-special-env.ss @@ -7,7 +7,7 @@ (only-in scheme/list cons? take drop add-between last filter-map) (only-in rnrs/lists-6 fold-left) '#%paramz - (only-in scheme/match/runtime match:error) + (only-in racket/match/runtime match:error) scheme/promise string-constants/string-constant ;(prefix-in ce: test-engine/scheme-tests) diff --git a/collects/typed-scheme/private/with-types.ss b/collects/typed-scheme/private/with-types.ss index 06c550b6..9e0c85dd 100644 --- a/collects/typed-scheme/private/with-types.ss +++ b/collects/typed-scheme/private/with-types.ss @@ -9,7 +9,7 @@ "extra-procs.ss" "prims.ss" "base-types.ss" - scheme/contract/regions scheme/contract/base + racket/contract/regions racket/contract/base (for-syntax "base-types-extra.ss" unstable/debug diff --git a/collects/typed-scheme/typecheck/provide-handling.ss b/collects/typed-scheme/typecheck/provide-handling.ss index ecfc7a92..88eb1126 100644 --- a/collects/typed-scheme/typecheck/provide-handling.ss +++ b/collects/typed-scheme/typecheck/provide-handling.ss @@ -9,7 +9,7 @@ (private typed-renaming) (rep type-rep) (utils tc-utils) - scheme/contract/private/provide unstable/list + racket/contract/private/provide unstable/list unstable/debug unstable/syntax scheme/struct-info scheme/match "def-binding.ss" syntax/parse) diff --git a/collects/typed-scheme/typecheck/tc-app.ss b/collects/typed-scheme/typecheck/tc-app.ss index 75c04c36..aacdd162 100644 --- a/collects/typed-scheme/typecheck/tc-app.ss +++ b/collects/typed-scheme/typecheck/tc-app.ss @@ -7,7 +7,7 @@ unstable/sequence ;; fixme - don't need to be bound in this phase - only to make syntax/parse happy scheme/bool - (only-in scheme/private/class-internal make-object do-make-object) + (only-in racket/private/class-internal make-object do-make-object) (only-in '#%kernel [apply k:apply]) ;; end fixme (for-syntax syntax/parse scheme/base (utils tc-utils)) @@ -21,7 +21,7 @@ (for-template (only-in '#%kernel [apply k:apply]) "internal-forms.ss" scheme/base scheme/bool - (only-in scheme/private/class-internal make-object do-make-object))) + (only-in racket/private/class-internal make-object do-make-object))) (import tc-expr^ tc-lambda^ tc-dots^ tc-let^) (export tc-app^) diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.ss b/collects/typed-scheme/typecheck/tc-expr-unit.ss index dbe0f184..834aa68f 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.ss +++ b/collects/typed-scheme/typecheck/tc-expr-unit.ss @@ -12,11 +12,11 @@ (except-in (utils tc-utils stxclass-util)) (env lexical-env) (only-in (env type-environments) lookup current-tvars extend-env) - scheme/private/class-internal + racket/private/class-internal (except-in syntax/parse id) (only-in srfi/1 split-at)) -(require (for-template scheme/base scheme/private/class-internal)) +(require (for-template scheme/base racket/private/class-internal)) (import tc-if^ tc-lambda^ tc-app^ tc-let^ check-subforms^) (export tc-expr^) From 8cf31c8de6aa12b35c016e0f35655ae516eb2d4c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 21 Apr 2010 18:50:16 -0600 Subject: [PATCH 2/2] change #:module-info to #:language-info for consistency with module->language-info original commit: 7503f8c6e948a7e949cc4bb48e4fad71f877c90c --- collects/typed-scheme/{module-info.ss => language-info.ss} | 6 +++--- collects/typed/scheme/base/lang/reader.ss | 6 +++--- collects/typed/scheme/lang/reader.ss | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename collects/typed-scheme/{module-info.ss => language-info.ss} (73%) diff --git a/collects/typed-scheme/module-info.ss b/collects/typed-scheme/language-info.ss similarity index 73% rename from collects/typed-scheme/module-info.ss rename to collects/typed-scheme/language-info.ss index 864540fe..ebecb8e2 100644 --- a/collects/typed-scheme/module-info.ss +++ b/collects/typed-scheme/language-info.ss @@ -1,10 +1,10 @@ #lang scheme/base (require typed-scheme/typed-reader) -(provide module-info configure) +(provide get-info configure) -(define ((module-info arg) key default) +(define ((get-info arg) key default) (case key - [(configure-runtime) `(#(typed-scheme/module-info configure ()))] + [(configure-runtime) `(#(typed-scheme/language-info configure ()))] [else default])) ;; options currently always empty diff --git a/collects/typed/scheme/base/lang/reader.ss b/collects/typed/scheme/base/lang/reader.ss index ce8f8d0f..b0982890 100644 --- a/collects/typed/scheme/base/lang/reader.ss +++ b/collects/typed/scheme/base/lang/reader.ss @@ -5,14 +5,14 @@ typed/scheme/base #:read r:read #:read-syntax r:read-syntax #:info make-info -#:module-info make-module-info +#:language-info make-language-info (define (make-info key default use-default) (case key [else (use-default key default)])) -(define make-module-info - `#(typed-scheme/module-info module-info ())) +(define make-language-info + `#(typed-scheme/language-info get-info ())) (require (prefix-in r: typed-scheme/typed-reader)) diff --git a/collects/typed/scheme/lang/reader.ss b/collects/typed/scheme/lang/reader.ss index 3a91f1a7..0c7fbe6b 100644 --- a/collects/typed/scheme/lang/reader.ss +++ b/collects/typed/scheme/lang/reader.ss @@ -5,14 +5,14 @@ typed/scheme #:read r:read #:read-syntax r:read-syntax #:info make-info -#:module-info make-module-info +#:language-info make-language-info (define (make-info key default use-default) (case key [else (use-default key default)])) -(define make-module-info - `#(typed-scheme/module-info module-info ())) +(define make-language-info + `#(typed-scheme/language-info get-info ())) (require (prefix-in r: typed-scheme/typed-reader))