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

implement autocompilation

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2009-06-03 18:22:39 +02:00
parent 0fb81f95b0
commit ee00175026
3 changed files with 92 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libguile/script.c
View file

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