mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

autocompile -> auto-compile

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2011-02-13 10:41:44 +01:00
parent c50775e246
commit 6f06e8d35f
14 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -581,12 +581,12 @@ newer than that of the .scm file; if the .scm or .go files are moved
after installation, care should be taken to preserve their original
timestamps.
Autocompiled files will be stored in the $XDG_CACHE_HOME/guile/ccache
Auto-compiled files will be stored in the $XDG_CACHE_HOME/guile/ccache
directory, where $XDG_CACHE_HOME defaults to ~/.cache. This directory
will be created if needed.
To inhibit autocompilation, set the GUILE_AUTO_COMPILE environment
variable to 0, or pass --no-autocompile on the Guile command line.
To inhibit automatic compilation, set the GUILE_AUTO_COMPILE environment
variable to 0, or pass --no-auto-compile on the Guile command line.
** New POSIX procedures: `getrlimit' and `setrlimit'

2
check-guile.in
View file

@ -43,7 +43,7 @@ fi
exec $guile \
--debug \
--no-autocompile -e main -s "$TEST_SUITE_DIR/guile-test" \
--no-auto-compile -e main -s "$TEST_SUITE_DIR/guile-test" \
--test-suite "$TEST_SUITE_DIR/tests" \
--log-file check-guile.log "$@"

4
doc/guile.1
View file

@ -60,9 +60,9 @@ conjuction with -s.
.IP --debug
Start guile with the debugging VM. By default, on when invoked
interactively, off otherwise.
.IP --autocompile
.IP --auto-compile
Compile source files automatically (default behavior).
.IP --no-autocompile
.IP --no-auto-compile
Disable automatic source file compilation.
.IP --listen[=P]
Listen on a port or socket for remote REPL connections. See the manual

6
doc/ref/scheme-scripts.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011
@c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@ -219,12 +219,12 @@ development.
@vnew{2.0}
@item --autocompile
@item --auto-compile
Compile source files automatically (default behavior).
@vnew{2.0}
@item --no-autocompile
@item --no-auto-compile
Disable automatic source file compilation.
@vnew{2.0}

2
libguile/init.c
View file

@ -546,7 +546,7 @@ scm_i_init_guile (SCM_STACKITEM *base)
atexit (cleanup_for_exit);
scm_load_startup_files ();
scm_init_load_should_autocompile ();
scm_init_load_should_auto_compile ();
/* Capture the dynamic state after loading boot-9, so that new threads end up
in the guile-user module. */

38
libguile/load.c
View file

@ -207,9 +207,9 @@ static SCM *scm_loc_load_compiled_path;
static SCM *scm_loc_load_compiled_extensions;
/* Whether we should try to auto-compile. */
static SCM *scm_loc_load_should_autocompile;
static SCM *scm_loc_load_should_auto_compile;
/* The fallback path for autocompilation */
/* The fallback path for auto-compilation */
static SCM *scm_loc_compile_fallback_path;
SCM_DEFINE (scm_parse_path, "parse-path", 1, 1, 0,
@ -669,7 +669,7 @@ compiled_is_fresh (SCM full_filename, SCM compiled_filename)
SCM_KEYWORD (kw_env, "env");
static SCM
do_try_autocompile (void *data)
do_try_auto_compile (void *data)
{
SCM source = PTR2SCM (data);
SCM comp_mod, compile_file;
@ -696,14 +696,14 @@ do_try_autocompile (void *data)
{
scm_puts (";;; it seems ", scm_current_error_port ());
scm_display (source, scm_current_error_port ());
scm_puts ("\n;;; is part of the compiler; skipping autocompilation\n",
scm_puts ("\n;;; is part of the compiler; skipping auto-compilation\n",
scm_current_error_port ());
return SCM_BOOL_F;
}
}
static SCM
autocompile_catch_handler (void *data, SCM tag, SCM throw_args)
auto_compile_catch_handler (void *data, SCM tag, SCM throw_args)
{
SCM source = PTR2SCM (data);
scm_puts (";;; WARNING: compilation of ", scm_current_error_port ());
@ -717,16 +717,16 @@ autocompile_catch_handler (void *data, SCM tag, SCM throw_args)
return SCM_BOOL_F;
}
SCM_DEFINE (scm_sys_warn_autocompilation_enabled, "%warn-autocompilation-enabled", 0, 0, 0,
SCM_DEFINE (scm_sys_warn_auto_compilation_enabled, "%warn-auto-compilation-enabled", 0, 0, 0,
(void), "")
#define FUNC_NAME s_scm_sys_warn_autocompilation_enabled
#define FUNC_NAME s_scm_sys_warn_auto_compilation_enabled
{
static int message_shown = 0;
if (!message_shown)
{
scm_puts (";;; note: autocompilation is enabled, set GUILE_AUTO_COMPILE=0\n"
";;; or pass the --no-autocompile argument to disable.\n",
scm_puts (";;; note: auto-compilation is enabled, set GUILE_AUTO_COMPILE=0\n"
";;; or pass the --no-auto-compile argument to disable.\n",
scm_current_error_port ());
message_shown = 1;
}
@ -736,16 +736,16 @@ SCM_DEFINE (scm_sys_warn_autocompilation_enabled, "%warn-autocompilation-enabled
#undef FUNC_NAME
static SCM
scm_try_autocompile (SCM source)
scm_try_auto_compile (SCM source)
{
if (scm_is_false (*scm_loc_load_should_autocompile))
if (scm_is_false (*scm_loc_load_should_auto_compile))
return SCM_BOOL_F;
scm_sys_warn_autocompilation_enabled ();
scm_sys_warn_auto_compilation_enabled ();
return scm_c_catch (SCM_BOOL_T,
do_try_autocompile,
do_try_auto_compile,
SCM2PTR (source),
autocompile_catch_handler,
auto_compile_catch_handler,
SCM2PTR (source),
NULL, NULL);
}
@ -855,7 +855,7 @@ SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 0, 0, 1,
/* Otherwise, we bottom out here. */
{
SCM freshly_compiled = scm_try_autocompile (full_filename);
SCM freshly_compiled = scm_try_auto_compile (full_filename);
if (scm_is_true (freshly_compiled))
return scm_load_compiled_with_vm (freshly_compiled);
@ -933,8 +933,8 @@ scm_init_load ()
scm_loc_compile_fallback_path
= SCM_VARIABLE_LOC (scm_c_define ("%compile-fallback-path", SCM_BOOL_F));
scm_loc_load_should_autocompile
= SCM_VARIABLE_LOC (scm_c_define ("%load-should-autocompile", SCM_BOOL_F));
scm_loc_load_should_auto_compile
= SCM_VARIABLE_LOC (scm_c_define ("%load-should-auto-compile", SCM_BOOL_F));
the_reader = scm_make_fluid ();
scm_fluid_set_x (the_reader, SCM_BOOL_F);
@ -950,9 +950,9 @@ scm_init_load ()
}
void
scm_init_load_should_autocompile ()
scm_init_load_should_auto_compile ()
{
*scm_loc_load_should_autocompile =
*scm_loc_load_should_auto_compile =
scm_from_bool (scm_getenv_int ("GUILE_AUTO_COMPILE", 1));
}

6
libguile/load.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_LOAD_H
#define SCM_LOAD_H
/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@ -37,10 +37,10 @@ SCM_API SCM scm_search_path (SCM path, SCM filename, SCM rest);
SCM_API SCM scm_sys_search_load_path (SCM filename);
SCM_API SCM scm_primitive_load_path (SCM filename_and_exception_on_not_found);
SCM_API SCM scm_c_primitive_load_path (const char *filename);
SCM_INTERNAL SCM scm_sys_warn_autocompilation_enabled (void);
SCM_INTERNAL SCM scm_sys_warn_auto_compilation_enabled (void);
SCM_INTERNAL void scm_init_load_path (void);
SCM_INTERNAL void scm_init_load (void);
SCM_INTERNAL void scm_init_load_should_autocompile (void);
SCM_INTERNAL void scm_init_load_should_auto_compile (void);
SCM_INTERNAL void scm_init_eval_in_scheme (void);
#endif /* SCM_LOAD_H */

18
libguile/script.c
View file

@ -383,9 +383,9 @@ scm_shell_usage (int fatal, char *message)
" --no-debug start with normal evaluator\n"
" Default is to enable debugging for interactive\n"
" use, but not for `-s' and `-c'.\n"
" --autocompile compile source files automatically\n"
" --no-autocompile disable automatic source file compilation\n"
" Default is to enable autocompilation of source\n"
" --auto-compile compile source files automatically\n"
" --no-auto-compile disable automatic source file compilation\n"
" Default is to enable auto-compilation of source\n"
" files.\n"
" --listen[=P] Listen on a local port or a path for REPL clients.\n"
" If P is not given, the default is local port 37146.\n"
@ -417,7 +417,7 @@ SCM_SYMBOL (sym_use_srfis, "use-srfis");
SCM_SYMBOL (sym_load_path, "%load-path");
SCM_SYMBOL (sym_load_extensions, "%load-extensions");
SCM_SYMBOL (sym_set_x, "set!");
SCM_SYMBOL (sym_sys_load_should_autocompile, "%load-should-autocompile");
SCM_SYMBOL (sym_sys_load_should_auto_compile, "%load-should-auto-compile");
SCM_SYMBOL (sym_cons, "cons");
SCM_SYMBOL (sym_at, "@");
SCM_SYMBOL (sym_atat, "@@");
@ -612,14 +612,14 @@ scm_compile_shell_switches (int argc, char **argv)
turn_on_debugging = 0;
}
/* Do autocompile on/off now, because the form itself might need this
/* Do auto-compile on/off now, because the form itself might need this
decision. */
else if (! strcmp (argv[i], "--autocompile"))
scm_variable_set_x (scm_c_lookup ("%load-should-autocompile"),
else if (! strcmp (argv[i], "--auto-compile"))
scm_variable_set_x (scm_c_lookup ("%load-should-auto-compile"),
SCM_BOOL_T);
else if (! strcmp (argv[i], "--no-autocompile"))
scm_variable_set_x (scm_c_lookup ("%load-should-autocompile"),
else if (! strcmp (argv[i], "--no-auto-compile"))
scm_variable_set_x (scm_c_lookup ("%load-should-auto-compile"),
SCM_BOOL_F);
else if (! strcmp (argv[i], "-q")) /* don't load user init */

4
module/Makefile.am
View file

@ -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

10
module/ice-9/boot-9.scm
View file

@ -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))

6
module/scripts/compile.scm
View file

@ -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)

2
module/system/base/compile.scm
View file

@ -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)))

2
test-suite/Makefile.am
View file

@ -205,6 +205,6 @@ LALR_EXTRA += \
lalr/run-guile-test.sh
TESTS = $(LALR_TESTS)
TESTS_ENVIRONMENT = $(top_builddir)/meta/guile --no-autocompile
TESTS_ENVIRONMENT = $(top_builddir)/meta/guile --no-auto-compile
EXTRA_DIST += $(LALR_EXTRA) $(LALR_TESTS) tests/sxml-match-tests.ss

4
test-suite/tests/popen.test
View file

@ -1,6 +1,6 @@
;;;; popen.test --- exercise ice-9/popen.scm -*- scheme -*-
;;;;
;;;; Copyright 2003, 2006, 2010 Free Software Foundation, Inc.
;;;; Copyright 2003, 2006, 2010, 2011 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -168,7 +168,7 @@
(port (with-error-to-port (cdr c2p)
(lambda ()
(open-output-pipe
(string-append "guile --no-autocompile -s \""
(string-append "guile --no-auto-compile -s \""
(getenv "TEST_SUITE_DIR")
"/tests/popen-child.scm\""))))))
(close-port (cdr c2p)) ;; write side