From 1325701f829f0d04c2550e57ee4e28ee01c55f83 Mon Sep 17 00:00:00 2001 From: Blake Johnson Date: Thu, 15 Jul 2010 15:35:54 -0600 Subject: [PATCH 1/4] handling top-level-renames and mark-barriers (cherry picked from commit 8df94dd746b2a3b08e21f1a07730165294dc6821) original commit: 06c829d8c0e482abd1fbb534a9999c1f21aa1ac0 --- collects/compiler/zo-marshal.rkt | 4 ++++ collects/compiler/zo-parse.rkt | 4 ++-- collects/compiler/zo-structs.rkt | 9 ++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/collects/compiler/zo-marshal.rkt b/collects/compiler/zo-marshal.rkt index 0ff5989dfb..8333ef8c23 100644 --- a/collects/compiler/zo-marshal.rkt +++ b/collects/compiler/zo-marshal.rkt @@ -609,6 +609,10 @@ (vector-set! vec (+ 2 i) k) (vector-set! vec (+ 2 i len) v)) vec] + [(struct top-level-rename (flag)) + flag] + [(struct mark-barrier (value)) + value] [(struct prune (syms)) (box syms)] [(struct wrap-mark (val)) diff --git a/collects/compiler/zo-parse.rkt b/collects/compiler/zo-parse.rkt index 46ad7d584f..7c1186ed64 100644 --- a/collects/compiler/zo-parse.rkt +++ b/collects/compiler/zo-parse.rkt @@ -624,9 +624,9 @@ (and plus-kern? 'plus-kern)))] [else (error "bad module rename: ~e" a)]))] [(boolean? a) - `(#%top-level-rename ,a)] + (make-top-level-rename a)] [(symbol? a) - '(#%mark-barrier)] + (make-mark-barrier a)] [(box? a) (match (unbox a) [(list (? symbol?) ...) (make-prune (unbox a))] diff --git a/collects/compiler/zo-structs.rkt b/collects/compiler/zo-structs.rkt index 7c3e317bd4..daba19df57 100644 --- a/collects/compiler/zo-structs.rkt +++ b/collects/compiler/zo-structs.rkt @@ -23,6 +23,7 @@ (define-syntax-rule (define-form-struct* id id+par ([field-id field-contract] ...)) (begin (define-struct id+par (field-id ...) #:prefab) + #;(provide (struct-out id)) (provide/contract [struct id ([field-id field-contract] ...)]))) @@ -147,7 +148,7 @@ (define-form-struct (primval expr) ([id exact-nonnegative-integer?])) ; direct preference to a kernel primitive ;; Top-level `require' -(define-form-struct (req form) ([reqs syntax?] [dummy toplevel?])) +(define-form-struct (req form) ([reqs stx?] [dummy toplevel?])) (define-form-struct (lexical-rename wrap) ([bool1 boolean?] ; this needs a name [bool2 boolean?] ; this needs a name @@ -194,6 +195,12 @@ [mark-renames any/c] [plus-kern? boolean?])) +; XXX better name for 'flag' +(define-form-struct (top-level-rename wrap) ([flag boolean?])) + +; XXX better name for 'value' +(define-form-struct (mark-barrier wrap) ([value symbol?])) + (provide/contract (struct indirect ([v (or/c closure? #f)]))) From 8e53d9458b2c81025ec4e3b1b9e963057d7bf604 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 19 Jul 2010 13:55:23 -0600 Subject: [PATCH 2/4] raco exe: fix missing ss->rkt conversion and remove debugging printf Merge to 5.0.1 (cherry picked from commit f602d11a7f77fb8cd14d11698150a8240a7d4b3f) original commit: 77a0796a6ca17b061cfb9531189276012ca66ff2 --- collects/tests/racket/embed.rktl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/collects/tests/racket/embed.rktl b/collects/tests/racket/embed.rktl index 25036d3566..16a4e71a87 100644 --- a/collects/tests/racket/embed.rktl +++ b/collects/tests/racket/embed.rktl @@ -460,6 +460,7 @@ (go '(planet racket-tester/p1/alt) "one\nalt\n") (go '(planet racket-tester/p1/other) "two\nother\n") (go '(planet "private/sub.rkt" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n") + (go '(planet "private/sub.ss" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n") (void)) @@ -468,11 +469,11 @@ ;; ---------------------------------------- -(try-basic) -(try-mzc) -(try-extension) -(try-gracket) -(try-reader) +;(try-basic) +;(try-mzc) +;(try-extension) +;(try-gracket) +;(try-reader) (try-planet) ;; ---------------------------------------- From b4ec84d1a9c3ce673ae2690547d3d400e7d69b95 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 20 Jul 2010 06:36:24 -0600 Subject: [PATCH 3/4] another ss->rkt repair to exe creator Merge to 5.0.1 (cherry picked from commit ce03a3431829ac54a1cccfc392881eca1b766dcd) original commit: 6c79f0d39975a24038ea67269e6e92ae244b389c --- collects/tests/racket/embed.rktl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/collects/tests/racket/embed.rktl b/collects/tests/racket/embed.rktl index 16a4e71a87..457f2ea6b4 100644 --- a/collects/tests/racket/embed.rktl +++ b/collects/tests/racket/embed.rktl @@ -461,6 +461,7 @@ (go '(planet racket-tester/p1/other) "two\nother\n") (go '(planet "private/sub.rkt" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n") (go '(planet "private/sub.ss" ("racket-tester" "p2.plt" 2 0)) "two\nsub\n") + (go '(planet "main.ss" ("racket-tester" "p2.plt" 2 0)) "two\n") (void)) @@ -469,11 +470,11 @@ ;; ---------------------------------------- -;(try-basic) -;(try-mzc) -;(try-extension) -;(try-gracket) -;(try-reader) +(try-basic) +(try-mzc) +(try-extension) +(try-gracket) +(try-reader) (try-planet) ;; ---------------------------------------- From ad67592f9815327c508640e72925087020ec8ae6 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Fri, 30 Jul 2010 04:20:46 -0400 Subject: [PATCH 4/4] typo (cherry picked from commit 14de7399bd592b76899acc00611b47952c9ce90d) original commit: 700cb5ee8d2adff343ef79732c2010e7c55cae7d --- collects/compiler/commands/exe.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collects/compiler/commands/exe.rkt b/collects/compiler/commands/exe.rkt index 59a956f60f..117e44429b 100644 --- a/collects/compiler/commands/exe.rkt +++ b/collects/compiler/commands/exe.rkt @@ -23,7 +23,7 @@ #:once-each [("-o") file "Write executable as " (exe-output file)] - [("--gui") "Geneate GUI executable" + [("--gui") "Generate GUI executable" (gui #t)] [("--collects-path") path "Set as main collects for executable" (exe-embedded-collects-path path)]