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

Allow specifying load extensions on the command line

Browse source 
Add a new command-line switch `-x', which manipulates the
%load-extensions list.

* libguile/script.c (scm_compile_shell_switches): Process the new "-x"
  switch.
  (scm_shell_usage): Mention the "-x" switch.
* doc/ref/scheme-scripts.texi (Invoking Guile): Add "-x" switch to the
  list of command-line switches.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Andreas Rottmann 2010-11-20 01:05:10 +01:00 • committed by Ludovic Courtès
parent ec84b0a251
commit b710608c87
3 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
NEWS
View file

@ -8,6 +8,13 @@ Please send Guile bug reports to bug-guile@gnu.org.
Note: During the 1.9 series, we will keep an incremental NEWS for the
latest prerelease, and a full NEWS corresponding to 1.8 -> 2.0.
Changes in 1.9.14 (since the 1.9.13 prerelease):
** Command line additions
The guile binary now supports a new switch "-x", which can be used to
extend the list of filename extensions tried when loading files
(%load-extensions).
Changes in 1.9.13 (since the 1.9.12 prerelease):

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

@ -116,6 +116,13 @@ and before any directories in the GUILE_LOAD_PATH environment
variable. Paths added here are @emph{not} in effect during execution
of the user's @file{.guile} file.
@item -x @var{extension}
Add @var{extension} to the front of Guile's load extension list
(@pxref{Loading, @code{%load-extensions}}). The specified extensions
are tried in the order given on the command line, and before the default
load extensions. Extensions added here are @emph{not} in effect during
execution of the user's @file{.guile} file.
@item -l @var{file}
Load Scheme source code from @var{file}, and continue processing the
command line.

22
libguile/script.c
View file

@ -374,6 +374,7 @@ scm_shell_usage (int fatal, char *message)
"If FILE begins with `-' the -s switch is mandatory.\n"
"\n"
" -L DIRECTORY add DIRECTORY to the front of the module load path\n"
" -x EXTENSION add EXTENSION to the front of the load extensions\n"
" -l FILE load Scheme source code from FILE\n"
" -e FUNCTION after reading script, apply FUNCTION to\n"
" command line arguments\n"
@ -414,6 +415,7 @@ SCM_SYMBOL (sym_top_repl, "top-repl");
SCM_SYMBOL (sym_quit, "quit");
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_cons, "cons");
@ -455,6 +457,7 @@ scm_compile_shell_switches (int argc, char **argv)
the "-ds" switch. */
SCM entry_point = SCM_EOL; /* for -e switch */
SCM user_load_path = SCM_EOL; /* for -L switch */
SCM user_extensions = SCM_EOL;/* for -x switch */
int interactive = 1; /* Should we go interactive when done? */
int inhibit_user_init = 0; /* Don't load user init file */
int turn_on_debugging = 0;
@ -546,6 +549,20 @@ scm_compile_shell_switches (int argc, char **argv)
scm_shell_usage (1, "missing argument to `-L' switch");
}
else if (! strcmp (argv[i], "-x")) /* add to %load-extensions */
{
if (++i < argc)
user_extensions =
scm_cons (scm_list_3 (sym_set_x,
sym_load_extensions,
scm_list_3 (sym_cons,
scm_from_locale_string (argv[i]),
sym_load_extensions)),
user_extensions);
else
scm_shell_usage (1, "missing argument to `-x' switch");
}
else if (! strcmp (argv[i], "-e")) /* entry point */
{
if (++i < argc)
@ -762,7 +779,10 @@ scm_compile_shell_switches (int argc, char **argv)
{
tail = scm_append_x( scm_cons2(user_load_path, tail, SCM_EOL) );
}
if (!scm_is_null (user_extensions))
tail = scm_append_x (scm_cons2 (user_extensions, tail, SCM_EOL));
/* If we didn't end with a -c or a -s and didn't supply a -q, load
the user's customization file. */
if (interactive && !inhibit_user_init)