From d728e9118d42f0c6b7a46c292a6ecbc42d6b59e6 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 26 Feb 2013 18:36:06 -0700 Subject: [PATCH] try "phase-collapsing" instead of "phaseless" original commit: 2646ff6895caf24f3517a5dd654ea6280d3aefe0 --- collects/compiler/zo-marshal.rkt | 2 +- collects/compiler/zo-parse.rkt | 4 ++-- collects/compiler/zo-structs.rkt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collects/compiler/zo-marshal.rkt b/collects/compiler/zo-marshal.rkt index a8b787c08f..60c79b7120 100644 --- a/collects/compiler/zo-marshal.rkt +++ b/collects/compiler/zo-marshal.rkt @@ -1091,7 +1091,7 @@ [l (cons lang-info l)] ; lang-info [l (cons (map convert-module post-submodules) l)] [l (cons (map convert-module pre-submodules) l)] - [l (cons (if (memq 'phaseless flags) #t #f) l)] + [l (cons (if (memq 'phase-collapsing flags) #t #f) l)] [l (cons self-modidx l)] [l (cons srcname l)] [l (cons (if (pair? name) (car name) name) l)] diff --git a/collects/compiler/zo-parse.rkt b/collects/compiler/zo-parse.rkt index 4aaf58de45..7af7b06604 100644 --- a/collects/compiler/zo-parse.rkt +++ b/collects/compiler/zo-parse.rkt @@ -251,7 +251,7 @@ (define (read-module v) (match v [`(,submod-path - ,name ,srcname ,self-modidx ,phaseless? + ,name ,srcname ,self-modidx ,phase-collapsing? ,pre-submods ,post-submods ,lang-info ,functional? ,et-functional? ,rename ,max-let-depth ,dummy @@ -337,7 +337,7 @@ dummy lang-info rename - (if phaseless? '(phaseless) '()) + (if phase-collapsing? '(phase-collapsing) '()) (map read-module pre-submods) (map read-module post-submods))]))])) (define (read-module-wrap v) diff --git a/collects/compiler/zo-structs.rkt b/collects/compiler/zo-structs.rkt index 78fa6e2de9..f8a392e10c 100644 --- a/collects/compiler/zo-structs.rkt +++ b/collects/compiler/zo-structs.rkt @@ -139,7 +139,7 @@ [dummy toplevel?] [lang-info (or/c #f (vector/c module-path? symbol? any/c))] [internal-context (or/c #f #t stx? (vectorof stx?))] - [flags (listof (or/c 'phaseless))] + [flags (listof (or/c 'phase-collapsing))] [pre-submodules (listof mod?)] [post-submodules (listof mod?)]))