diff options
author | Andy Wingo <wingo@pobox.com> | 2009-06-03 18:22:39 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-06-03 22:20:55 +0200 |
commit | ee001750269b34179a90aa5c0dc90bd0ffdb8869 (patch) | |
tree | a2ff599513d198154dd959f1fadba49ce05f2a44 /libguile/script.c | |
parent | 0fb81f95b0222c5ba49efd3e36cf797df54c0863 (diff) | |
download | guile-ee001750269b34179a90aa5c0dc90bd0ffdb8869.tar.gz |
implement autocompilation
* am/guilec (.scm.go): Set GUILE_AUTO_COMPILE=0 when compiling individual
files, and remove the mkdir -p as compile-file takes care of that now.
* libguile/load.c (do_try_autocompile, autocompile_catch_handler)
(scm_try_autocompile, scm_init_load): Implement autocompilation.
* libguile/script.c (scm_shell_usage, scm_compile_shell_switches): Add
--autocompile / --no-autocompile command-line options, and support for
the GUILE_AUTO_COMPILE environment variable, defaulting to
autocompilation enabled.
Diffstat (limited to 'libguile/script.c')
-rw-r--r-- | libguile/script.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libguile/script.c b/libguile/script.c index 14691c738..c61e85a8d 100644 --- a/libguile/script.c +++ b/libguile/script.c @@ -29,6 +29,7 @@ #include "libguile/eval.h" #include "libguile/feature.h" #include "libguile/load.h" +#include "libguile/private-gc.h" /* scm_getenv_int */ #include "libguile/read.h" #include "libguile/script.h" #include "libguile/strings.h" @@ -376,6 +377,10 @@ 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" + " files.\n" " -q inhibit loading of user init file\n" " --emacs enable Emacs protocol (experimental)\n" " --use-srfi=LS load SRFI modules for the SRFIs in LS,\n" @@ -404,6 +409,7 @@ SCM_SYMBOL (sym_quit, "quit"); SCM_SYMBOL (sym_use_srfis, "use-srfis"); SCM_SYMBOL (sym_load_path, "%load-path"); SCM_SYMBOL (sym_set_x, "set!"); +SCM_SYMBOL (sym_sys_load_should_autocompile, "%load-should-autocompile"); SCM_SYMBOL (sym_cons, "cons"); SCM_SYMBOL (sym_at, "@"); SCM_SYMBOL (sym_atat, "@@"); @@ -448,6 +454,8 @@ scm_compile_shell_switches (int argc, char **argv) int use_emacs_interface = 0; int turn_on_debugging = 0; int dont_turn_on_debugging = 0; + int turn_on_autocompile = 0; + int dont_turn_on_autocompile = 0; int i; char *argv0 = guile; @@ -584,6 +592,18 @@ scm_compile_shell_switches (int argc, char **argv) turn_on_debugging = 0; } + else if (! strcmp (argv[i], "--autocompile")) + { + turn_on_autocompile = 1; + dont_turn_on_autocompile = 0; + } + + else if (! strcmp (argv[i], "--no-autocompile")) + { + dont_turn_on_autocompile = 1; + turn_on_autocompile = 0; + } + else if (! strcmp (argv[i], "--emacs")) /* use emacs protocol */ use_emacs_interface = 1; @@ -701,6 +721,16 @@ scm_compile_shell_switches (int argc, char **argv) tail = scm_cons (scm_cons (sym_load_user_init, SCM_EOL), tail); } + /* If GUILE_AUTO_COMPILE is not set and no args are given, default to + autocompilation. */ + if (turn_on_autocompile || (scm_getenv_int ("GUILE_AUTO_COMPILE", 1) + && !dont_turn_on_autocompile)) + { + tail = scm_cons (scm_list_3 (sym_set_x, sym_sys_load_should_autocompile, + SCM_BOOL_T), + tail); + } + /* If debugging was requested, or we are interactive and debugging was not explicitly turned off, turn on debugging. */ if (turn_on_debugging || (interactive && !dont_turn_on_debugging)) |