From c16fd0009e20215811d210834ce20147275cf67f Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sun, 18 Jun 2006 16:31:02 +0000 Subject: [PATCH] * compile-omit-files will not prevent compilation of a required (compiled) file, document this * remove redundant compile-omit-files from config/info * Make configtab introduce the missing bindings unhygienically, so there are no made up names in the zo, which makes it possible to easily replace config.ss without re-compiling everything. svn: r3400 --- collects/compiler/doc.txt | 4 +++- collects/config/info.ss | 3 +-- collects/setup/configtab.ss | 16 ++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/collects/compiler/doc.txt b/collects/compiler/doc.txt index 08ee9948ec..3feea8f1ee 100644 --- a/collects/compiler/doc.txt +++ b/collects/compiler/doc.txt @@ -147,7 +147,9 @@ next section. files in this list. If a file contains elaboration time expressions (e.g., macros, signatures) that are not intended to be local to the file, then the file should be included in - this list. + this list. Note: files that are required by other files that + are compiled will get compiled in the process even when + listed here. > compile-extension-omit-files - a list of filenames to extend the list returned for `compile-omit-files'. Unlike the list diff --git a/collects/config/info.ss b/collects/config/info.ss index 582902e258..bc0fdf2249 100644 --- a/collects/config/info.ss +++ b/collects/config/info.ss @@ -1,4 +1,3 @@ (module info (lib "infotab.ss" "setup") (define name "Config") - (define doc.txt "doc.txt") - (define compile-omit-files '("config.ss"))) + (define doc.txt "doc.txt")) diff --git a/collects/setup/configtab.ss b/collects/setup/configtab.ss index 0d94c95bb9..a54d540efe 100644 --- a/collects/setup/configtab.ss +++ b/collects/setup/configtab.ss @@ -73,19 +73,15 @@ #`(delay (to-path #,val)) val)) (syntax->list #'(name ...)) (syntax->list #'(val ...)))]) + (define ((mkdef v) id) + (if (memq id syms) + '() + (list #`(define #,(datum->syntax-object stx id stx) #,v)))) #`(#%plain-module-begin (provide #,@path-exports #,@flag-exports) (define name expr) ... - #,@(apply append (map (lambda (id) - (if (memq id syms) - '() - (list #`(define #,id use-default)))) - path-exports)) - #,@(apply append (map (lambda (id) - (if (memq id syms) - '() - (list #`(define #,id #f)))) - flag-exports))))))]))) + #,@(apply append (map (mkdef #'use-default) path-exports)) + #,@(apply append (map (mkdef #'#f) flag-exports))))))]))) (provide (rename config-module-begin #%module-begin) define