From f579e30f1a8c224c29a9fe94ba7de9d5261cb0cb Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Sat, 3 Sep 2011 22:46:35 -0400 Subject: [PATCH 1/4] Fix require analysis heuristics for TS -> TR. original commit: 3122e559cbd0f38e2dc1ed31010616e6d1f91a45 --- collects/macro-debugger/analysis/private/moduledb.rkt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/collects/macro-debugger/analysis/private/moduledb.rkt b/collects/macro-debugger/analysis/private/moduledb.rkt index 6ce302e..a15d84a 100644 --- a/collects/macro-debugger/analysis/private/moduledb.rkt +++ b/collects/macro-debugger/analysis/private/moduledb.rkt @@ -21,7 +21,7 @@ [racket/match no-bypass] ['#%builtin no-drop] - [typed-scheme/private/base-env no-drop] - [typed-scheme/private/base-special-env no-drop] - [typed-scheme/private/base-env-numeric no-drop] - [typed-scheme/private/base-env-indexing no-drop]))) + [typed-racket/private/base-env no-drop] + [typed-racket/private/base-special-env no-drop] + [typed-racket/private/base-env-numeric no-drop] + [typed-racket/private/base-env-indexing no-drop]))) From b6ffe9a91a09f71db335fac03322eb791cd5404a Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 4 Sep 2011 08:45:54 -0400 Subject: [PATCH 2/4] Abolish "typed-scheme". original commit: 49a89da81860e09955f1678bab6106ce8eae8376 --- .../analysis/check-requires.rkt | 2 +- .../tests/macro-debugger/tests/collects.rkt | 112 +++++++++--------- .../tests/macro-debugger/tests/regression.rkt | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/collects/macro-debugger/analysis/check-requires.rkt b/collects/macro-debugger/analysis/check-requires.rkt index 95d2232..cfe2527 100644 --- a/collects/macro-debugger/analysis/check-requires.rkt +++ b/collects/macro-debugger/analysis/check-requires.rkt @@ -26,7 +26,7 @@ Usage: Examples: - (check-requires 'typed-scheme) + (check-requires 'typed-racket) (check-requires 'unstable/markparam) (check-requires 'macro-debugger/syntax-browser/widget) diff --git a/collects/tests/macro-debugger/tests/collects.rkt b/collects/tests/macro-debugger/tests/collects.rkt index ca882ec..a29701f 100644 --- a/collects/tests/macro-debugger/tests/collects.rkt +++ b/collects/tests/macro-debugger/tests/collects.rkt @@ -140,8 +140,8 @@ #:cache-keys? #t)))) (define modules-from-framework (trace-modules '(framework))) -(define modules-from-typed-scheme - #;(trace-modules '(typed-scheme)) +(define modules-from-typed-racket + #;(trace-modules '(typed-racket)) '(#| mzlib/contract mzlib/etc @@ -267,59 +267,59 @@ syntax/stx mzlib/trace |# - typed-scheme - typed-scheme/minimal - typed-scheme/private/base-env - typed-scheme/private/base-types - typed-scheme/private/check-subforms-unit - typed-scheme/private/def-binding - typed-scheme/private/effect-rep - typed-scheme/private/extra-procs - typed-scheme/private/free-variance - typed-scheme/private/infer - typed-scheme/private/infer-ops - typed-scheme/private/init-envs - typed-scheme/private/internal-forms - typed-scheme/private/interning - typed-scheme/private/lexical-env - typed-scheme/private/mutated-vars - typed-scheme/private/parse-type - typed-scheme/private/planet-requires - typed-scheme/private/prims - typed-scheme/private/provide-handling - typed-scheme/private/remove-intersect - typed-scheme/private/rep-utils - typed-scheme/private/require-contract - typed-scheme/private/resolve-type - typed-scheme/private/signatures - typed-scheme/private/subtype - typed-scheme/private/syntax-traversal - typed-scheme/private/tables - typed-scheme/private/tc-app-unit - typed-scheme/private/tc-expr-unit - typed-scheme/private/tc-if-unit - typed-scheme/private/tc-lambda-unit - typed-scheme/private/tc-let-unit - typed-scheme/private/tc-structs - typed-scheme/private/tc-toplevel - typed-scheme/private/tc-utils - typed-scheme/private/type-alias-env - typed-scheme/private/type-annotation - typed-scheme/private/type-comparison - typed-scheme/private/type-contract - typed-scheme/private/type-effect-convenience - typed-scheme/private/type-effect-printer - typed-scheme/private/type-env - typed-scheme/private/type-environments - typed-scheme/private/type-name-env - typed-scheme/private/type-rep - typed-scheme/private/type-utils - typed-scheme/private/typechecker - typed-scheme/private/unify - typed-scheme/private/union - typed-scheme/private/unit-utils - typed-scheme/private/utils - typed-scheme/typed-scheme)) + typed-racket + typed-racket/minimal + typed-racket/private/base-env + typed-racket/private/base-types + typed-racket/private/check-subforms-unit + typed-racket/private/def-binding + typed-racket/private/effect-rep + typed-racket/private/extra-procs + typed-racket/private/free-variance + typed-racket/private/infer + typed-racket/private/infer-ops + typed-racket/private/init-envs + typed-racket/private/internal-forms + typed-racket/private/interning + typed-racket/private/lexical-env + typed-racket/private/mutated-vars + typed-racket/private/parse-type + typed-racket/private/planet-requires + typed-racket/private/prims + typed-racket/private/provide-handling + typed-racket/private/remove-intersect + typed-racket/private/rep-utils + typed-racket/private/require-contract + typed-racket/private/resolve-type + typed-racket/private/signatures + typed-racket/private/subtype + typed-racket/private/syntax-traversal + typed-racket/private/tables + typed-racket/private/tc-app-unit + typed-racket/private/tc-expr-unit + typed-racket/private/tc-if-unit + typed-racket/private/tc-lambda-unit + typed-racket/private/tc-let-unit + typed-racket/private/tc-structs + typed-racket/private/tc-toplevel + typed-racket/private/tc-utils + typed-racket/private/type-alias-env + typed-racket/private/type-annotation + typed-racket/private/type-comparison + typed-racket/private/type-contract + typed-racket/private/type-effect-convenience + typed-racket/private/type-effect-printer + typed-racket/private/type-env + typed-racket/private/type-environments + typed-racket/private/type-name-env + typed-racket/private/type-rep + typed-racket/private/type-utils + typed-racket/private/typechecker + typed-racket/private/unify + typed-racket/private/union + typed-racket/private/unit-utils + typed-racket/private/utils + typed-racket/typed-racket)) (define big-libs-tests - (test-libs "Collections" modules-from-typed-scheme)) + (test-libs "Collections" modules-from-typed-racket)) diff --git a/collects/tests/macro-debugger/tests/regression.rkt b/collects/tests/macro-debugger/tests/regression.rkt index c745459..0189362 100644 --- a/collects/tests/macro-debugger/tests/regression.rkt +++ b/collects/tests/macro-debugger/tests/regression.rkt @@ -144,7 +144,7 @@ (local [(define x 1)] x))))]) (check-pred list? rs))) - ;; Distilled from Sam/typed-scheme (8/24/2007) + ;; Distilled from Sam/typed-racket (8/24/2007) (test-case "transformer calls 'expand'" (check-pred deriv? (trace '(let-syntax ([m (lambda (stx) From df9efe20968e47f50e771797ba64c63a35d62b35 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 4 Sep 2011 10:27:58 -0400 Subject: [PATCH 3/4] Revert "Abolish "typed-scheme"." This reverts commit 49a89da81860e09955f1678bab6106ce8eae8376. (Will be redone later today.) original commit: 6ebf3ab32d666e9d1e56cd546fea29d18c42dfff --- .../analysis/check-requires.rkt | 2 +- .../tests/macro-debugger/tests/collects.rkt | 112 +++++++++--------- .../tests/macro-debugger/tests/regression.rkt | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/collects/macro-debugger/analysis/check-requires.rkt b/collects/macro-debugger/analysis/check-requires.rkt index cfe2527..95d2232 100644 --- a/collects/macro-debugger/analysis/check-requires.rkt +++ b/collects/macro-debugger/analysis/check-requires.rkt @@ -26,7 +26,7 @@ Usage: Examples: - (check-requires 'typed-racket) + (check-requires 'typed-scheme) (check-requires 'unstable/markparam) (check-requires 'macro-debugger/syntax-browser/widget) diff --git a/collects/tests/macro-debugger/tests/collects.rkt b/collects/tests/macro-debugger/tests/collects.rkt index a29701f..ca882ec 100644 --- a/collects/tests/macro-debugger/tests/collects.rkt +++ b/collects/tests/macro-debugger/tests/collects.rkt @@ -140,8 +140,8 @@ #:cache-keys? #t)))) (define modules-from-framework (trace-modules '(framework))) -(define modules-from-typed-racket - #;(trace-modules '(typed-racket)) +(define modules-from-typed-scheme + #;(trace-modules '(typed-scheme)) '(#| mzlib/contract mzlib/etc @@ -267,59 +267,59 @@ syntax/stx mzlib/trace |# - typed-racket - typed-racket/minimal - typed-racket/private/base-env - typed-racket/private/base-types - typed-racket/private/check-subforms-unit - typed-racket/private/def-binding - typed-racket/private/effect-rep - typed-racket/private/extra-procs - typed-racket/private/free-variance - typed-racket/private/infer - typed-racket/private/infer-ops - typed-racket/private/init-envs - typed-racket/private/internal-forms - typed-racket/private/interning - typed-racket/private/lexical-env - typed-racket/private/mutated-vars - typed-racket/private/parse-type - typed-racket/private/planet-requires - typed-racket/private/prims - typed-racket/private/provide-handling - typed-racket/private/remove-intersect - typed-racket/private/rep-utils - typed-racket/private/require-contract - typed-racket/private/resolve-type - typed-racket/private/signatures - typed-racket/private/subtype - typed-racket/private/syntax-traversal - typed-racket/private/tables - typed-racket/private/tc-app-unit - typed-racket/private/tc-expr-unit - typed-racket/private/tc-if-unit - typed-racket/private/tc-lambda-unit - typed-racket/private/tc-let-unit - typed-racket/private/tc-structs - typed-racket/private/tc-toplevel - typed-racket/private/tc-utils - typed-racket/private/type-alias-env - typed-racket/private/type-annotation - typed-racket/private/type-comparison - typed-racket/private/type-contract - typed-racket/private/type-effect-convenience - typed-racket/private/type-effect-printer - typed-racket/private/type-env - typed-racket/private/type-environments - typed-racket/private/type-name-env - typed-racket/private/type-rep - typed-racket/private/type-utils - typed-racket/private/typechecker - typed-racket/private/unify - typed-racket/private/union - typed-racket/private/unit-utils - typed-racket/private/utils - typed-racket/typed-racket)) + typed-scheme + typed-scheme/minimal + typed-scheme/private/base-env + typed-scheme/private/base-types + typed-scheme/private/check-subforms-unit + typed-scheme/private/def-binding + typed-scheme/private/effect-rep + typed-scheme/private/extra-procs + typed-scheme/private/free-variance + typed-scheme/private/infer + typed-scheme/private/infer-ops + typed-scheme/private/init-envs + typed-scheme/private/internal-forms + typed-scheme/private/interning + typed-scheme/private/lexical-env + typed-scheme/private/mutated-vars + typed-scheme/private/parse-type + typed-scheme/private/planet-requires + typed-scheme/private/prims + typed-scheme/private/provide-handling + typed-scheme/private/remove-intersect + typed-scheme/private/rep-utils + typed-scheme/private/require-contract + typed-scheme/private/resolve-type + typed-scheme/private/signatures + typed-scheme/private/subtype + typed-scheme/private/syntax-traversal + typed-scheme/private/tables + typed-scheme/private/tc-app-unit + typed-scheme/private/tc-expr-unit + typed-scheme/private/tc-if-unit + typed-scheme/private/tc-lambda-unit + typed-scheme/private/tc-let-unit + typed-scheme/private/tc-structs + typed-scheme/private/tc-toplevel + typed-scheme/private/tc-utils + typed-scheme/private/type-alias-env + typed-scheme/private/type-annotation + typed-scheme/private/type-comparison + typed-scheme/private/type-contract + typed-scheme/private/type-effect-convenience + typed-scheme/private/type-effect-printer + typed-scheme/private/type-env + typed-scheme/private/type-environments + typed-scheme/private/type-name-env + typed-scheme/private/type-rep + typed-scheme/private/type-utils + typed-scheme/private/typechecker + typed-scheme/private/unify + typed-scheme/private/union + typed-scheme/private/unit-utils + typed-scheme/private/utils + typed-scheme/typed-scheme)) (define big-libs-tests - (test-libs "Collections" modules-from-typed-racket)) + (test-libs "Collections" modules-from-typed-scheme)) diff --git a/collects/tests/macro-debugger/tests/regression.rkt b/collects/tests/macro-debugger/tests/regression.rkt index 0189362..c745459 100644 --- a/collects/tests/macro-debugger/tests/regression.rkt +++ b/collects/tests/macro-debugger/tests/regression.rkt @@ -144,7 +144,7 @@ (local [(define x 1)] x))))]) (check-pred list? rs))) - ;; Distilled from Sam/typed-racket (8/24/2007) + ;; Distilled from Sam/typed-scheme (8/24/2007) (test-case "transformer calls 'expand'" (check-pred deriv? (trace '(let-syntax ([m (lambda (stx) From 74d330956cbc02b9eec873c1287426ea063ffa5f Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 5 Sep 2011 16:08:16 -0600 Subject: [PATCH 4/4] generalized `begin-for-syntax' original commit: d3c56c9f13327d07513f8b6bf7ea0230acb7f489 --- collects/macro-debugger/model/trace.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collects/macro-debugger/model/trace.rkt b/collects/macro-debugger/model/trace.rkt index 527494b..db358c3 100644 --- a/collects/macro-debugger/model/trace.rkt +++ b/collects/macro-debugger/model/trace.rkt @@ -152,7 +152,7 @@ (eval/compile stx)] [(define-syntaxes . _) (eval/compile stx)] - [(define-values-for-syntax . _) + [(begin-for-syntax . _) (eval/compile stx)] [(define-values (id ...) . _) (with-syntax ([defvals (stx-car stx)]