diff options
author | Andy Wingo <wingo@pobox.com> | 2011-02-13 10:41:44 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-02-13 15:06:11 +0100 |
commit | 6f06e8d35f0780187c6bce62fe8ace8be055e727 (patch) | |
tree | 095dfb5d6102af1952992694e930a4d63f71e3d5 /module | |
parent | c50775e2460da0c9fa49817fe22896d0369184ac (diff) | |
download | guile-6f06e8d35f0780187c6bce62fe8ace8be055e727.tar.gz |
autocompile -> auto-compile
* NEWS:
* check-guile.in:
* doc/guile.1:
* doc/ref/scheme-scripts.texi:
* libguile/init.c:
* libguile/load.c:
* libguile/load.h:
* libguile/script.c:
* module/Makefile.am:
* module/ice-9/boot-9.scm:
* module/scripts/compile.scm:
* module/system/base/compile.scm:
* test-suite/Makefile.am:
* test-suite/tests/popen.test: Change "autocompile" to "auto-compile" or
"auto_compile", as appropriate, in variable names, function names,
command line arguments, and the documentation.
Diffstat (limited to 'module')
-rw-r--r-- | module/Makefile.am | 4 | ||||
-rw-r--r-- | module/ice-9/boot-9.scm | 10 | ||||
-rw-r--r-- | module/scripts/compile.scm | 6 | ||||
-rw-r--r-- | module/system/base/compile.scm | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/module/Makefile.am b/module/Makefile.am index f9fc3672e..994090015 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in. ## -## Copyright (C) 2009, 2010 Free Software Foundation, Inc. +## Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -75,7 +75,7 @@ ETAGS_ARGS += \ include $(top_srcdir)/am/pre-inst-guile ice-9/psyntax-pp.scm.gen: - $(preinstguile) --no-autocompile -s $(srcdir)/ice-9/compile-psyntax.scm \ + $(preinstguile) --no-auto-compile -s $(srcdir)/ice-9/compile-psyntax.scm \ $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm .PHONY: ice-9/psyntax-pp.scm.gen diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm index 0ec604b49..09a285d9b 100644 --- a/module/ice-9/boot-9.scm +++ b/module/ice-9/boot-9.scm @@ -2580,7 +2580,7 @@ module '(ice-9 q) '(make-q q-length))}." ;; Here we could allow some other search strategy (other than ;; primitive-load-path), for example using versions encoded ;; into the file system -- but then we would have to figure - ;; out how to locate the compiled file, do autocompilation, + ;; out how to locate the compiled file, do auto-compilation, ;; etc. Punt for now, and don't use versions when locating ;; the file. (primitive-load-path (in-vicinity dir-hint name) #f) @@ -3258,9 +3258,9 @@ module '(ice-9 q) '(make-q q-length))}." (define* (load-in-vicinity dir path #:optional reader) ;; Returns the .go file corresponding to `name'. Does not search load ;; paths, only the fallback path. If the .go file is missing or out of - ;; date, and autocompilation is enabled, will try autocompilation, just + ;; date, and auto-compilation is enabled, will try auto-compilation, just ;; as primitive-load-path does internally. primitive-load is - ;; unaffected. Returns #f if autocompilation failed or was disabled. + ;; unaffected. Returns #f if auto-compilation failed or was disabled. ;; ;; NB: Unless we need to compile the file, this function should not cause ;; (system base compile) to be loaded up. For that reason compiled-file-name @@ -3296,8 +3296,8 @@ module '(ice-9 q) '(make-q q-length))}." ";;; note: source file ~a\n;;; newer than compiled ~a\n" name go-path)) (cond - (%load-should-autocompile - (%warn-autocompilation-enabled) + (%load-should-auto-compile + (%warn-auto-compilation-enabled) (format (current-error-port) ";;; compiling ~a\n" name) (let ((cfn ((module-ref (resolve-interface '(system base compile)) diff --git a/module/scripts/compile.scm b/module/scripts/compile.scm index f3853ff6a..9763d1d6e 100644 --- a/module/scripts/compile.scm +++ b/module/scripts/compile.scm @@ -1,6 +1,6 @@ ;;; Compile --- Command-line Guile Scheme compiler -*- coding: iso-8859-1 -*- -;; Copyright 2005,2008,2009,2010 Free Software Foundation, Inc. +;; Copyright 2005,2008,2009,2010,2011 Free Software Foundation, Inc. ;; ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public License @@ -151,14 +151,14 @@ Compile each Guile source file FILE into a Guile object. -f, --from=LANG specify a source language other than `scheme' -t, --to=LANG specify a target language other than `objcode' -Note that autocompilation will be turned off. +Note that auto-compilation will be turned off. Report bugs to <~A>.~%" %guile-bug-report-address) (exit 0))) (set! %load-path (append load-path %load-path)) - (set! %load-should-autocompile #f) + (set! %load-should-auto-compile #f) (if (and output-file (or (null? input-files) diff --git a/module/system/base/compile.scm b/module/system/base/compile.scm index b4dfbcd9d..7d46713b2 100644 --- a/module/system/base/compile.scm +++ b/module/system/base/compile.scm @@ -118,7 +118,7 @@ (canonicalization 'relative)) (with-fluids ((%file-port-name-canonicalization canonicalization)) (let* ((comp (or output-file (compiled-file-name file) - (error "failed to create path for autocompiled file" + (error "failed to create path for auto-compiled file" file))) (in (open-input-file file)) (enc (file-encoding in))) |