From e800f1b4588e286506194019bfb9632f6e5425a9 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Sun, 18 Dec 2011 00:19:50 -0700 Subject: [PATCH] moved unstable/mutated-vars back to typed-racket original commit: e086d237cdd3b10a8f2157d663c1ba9e377b78f7 --- .../typed-racket/unit-tests/special-env-typecheck-tests.rkt | 4 ++-- collects/tests/typed-racket/unit-tests/typecheck-tests.rkt | 2 +- collects/typed-racket/env/lexical-env.rkt | 4 ++-- collects/typed-racket/tc-setup.rkt | 3 +-- collects/typed-racket/typecheck/tc-toplevel.rkt | 4 ++-- collects/{unstable => typed-racket/utils}/mutated-vars.rkt | 0 6 files changed, 8 insertions(+), 9 deletions(-) rename collects/{unstable => typed-racket/utils}/mutated-vars.rkt (100%) diff --git a/collects/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt b/collects/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt index fc148ac1..665f4c0e 100644 --- a/collects/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt +++ b/collects/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt @@ -11,14 +11,14 @@ [-> t:->])) (except-in (utils tc-utils utils) infer) typed-racket/infer/infer-dummy typed-racket/infer/infer - unstable/mutated-vars + (utils mutated-vars) rackunit rackunit/text-ui syntax/parse racket/file racket/port (for-syntax syntax/kerncase syntax/parse racket/syntax (types abbrev convenience utils) - unstable/mutated-vars + (utils mutated-vars) (utils tc-utils) (typecheck typechecker)) typed-racket/base-env/prims typed-racket/base-env/base-types diff --git a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt index acf64eda..db106b70 100644 --- a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt @@ -16,7 +16,7 @@ [-> t:->]) (except-in (utils tc-utils utils) infer) typed-racket/infer/infer-dummy typed-racket/infer/infer - unstable/mutated-vars + (utils mutated-vars) (env type-name-env type-env-structs init-envs) rackunit rackunit/text-ui syntax/parse diff --git a/collects/typed-racket/env/lexical-env.rkt b/collects/typed-racket/env/lexical-env.rkt index 60063904..4fbfbfcc 100644 --- a/collects/typed-racket/env/lexical-env.rkt +++ b/collects/typed-racket/env/lexical-env.rkt @@ -9,10 +9,10 @@ (require "../utils/utils.rkt" "type-env-structs.rkt" "global-env.rkt" - unstable/mutated-vars syntax/id-table + syntax/id-table (for-syntax syntax/parse syntax/parse/experimental/contract racket/base) (only-in scheme/contract ->* -> or/c any/c listof cons/c) - (utils tc-utils) + (utils tc-utils mutated-vars) (only-in (rep type-rep) Type/c) (typecheck tc-metafunctions) (except-in (types utils convenience) -> ->*)) diff --git a/collects/typed-racket/tc-setup.rkt b/collects/typed-racket/tc-setup.rkt index 8db87670..8acb457a 100644 --- a/collects/typed-racket/tc-setup.rkt +++ b/collects/typed-racket/tc-setup.rkt @@ -2,14 +2,13 @@ (require (rename-in "utils/utils.rkt" [infer r:infer]) (except-in syntax/parse id) - unstable/mutated-vars racket/pretty (private type-contract) (types utils convenience) (typecheck typechecker provide-handling tc-toplevel) (env tvar-env type-name-env type-alias-env) (r:infer infer) - (utils tc-utils disarm) + (utils tc-utils disarm mutated-vars) (rep type-rep) (except-in (utils utils) infer) (only-in (r:infer infer-dummy) infer-param) diff --git a/collects/typed-racket/typecheck/tc-toplevel.rkt b/collects/typed-racket/typecheck/tc-toplevel.rkt index d388f711..1355ca55 100644 --- a/collects/typed-racket/typecheck/tc-toplevel.rkt +++ b/collects/typed-racket/typecheck/tc-toplevel.rkt @@ -14,8 +14,8 @@ (types utils convenience type-table) (private parse-type type-annotation type-contract) (env global-env init-envs type-name-env type-alias-env lexical-env) - unstable/mutated-vars syntax/id-table - (utils tc-utils) + syntax/id-table + (utils tc-utils mutated-vars) "provide-handling.rkt" "def-binding.rkt" (prefix-in c: racket/contract) diff --git a/collects/unstable/mutated-vars.rkt b/collects/typed-racket/utils/mutated-vars.rkt similarity index 100% rename from collects/unstable/mutated-vars.rkt rename to collects/typed-racket/utils/mutated-vars.rkt