New: load can search multiple directories.

* eval.c (load_search_dirs_s): New symbol variable.
(load): Initialize the name variable whose address is passed
as the third argument of open_txr_file, which is now
an in-out parameter. Pass t for the new search_dirs parameter,
so that load benefits from the searching.
(eval_init): Initialize load_search_dirs_s and register the
*load-search-dirs* special variable.

* eval.h (load_search_dirs_s): Declared.
(load_search_dirs): New macro.

* match.c (v_load): Initialize the variable passed as third argument
of open_txr_file.

* parser.c (open_txr_file): Take a new argument, search_dirs.
If this is t, it tells the function "if the path is not found,
then recurse on the *load-search-dirs* variable. Otherwise,
if the value is not t, it is a list of the remaining directories
to try. The existing parameter orig_in_resolved_out must now
point to a location which is initialized. It is assumed to hold
the original target that was passed to the load function.
The first_try_path is a the path to actually try, derived from
that one.  Thus, the caller of open_txr_file gets to determine
the initial try path using its own algorithm. Then any recursive
calls that go through *load-search-dirs* will pass a first argument
which is made of the original name, combined with a search dir.
(load_rcfile): Pass pointer to initialized location as third
argument of open-txr_file, and pass a nil value for search_dirs:
no search takes place when looking for that file, which is at a
single, fixed location.

* parser.h (open_txr_file): Declaration updated.

* txr.c (sysroot_init): Initialize *load-search-dirs*.
(txr_main): Ensure third argument in all calls to open_txr_file
points to initialized variable, with the correct value,
and pass t for the search_dirs argument.

* txr.1: Documented.

* stdlib/doc-syms.tl: Updated.
New: load can search multiple directories.

* eval.c (load_search_dirs_s): New symbol variable.
(load): Initialize the name variable whose address is passed as
the third argument of open_txr_file, which is now an in-out
parameter. Pass t for the new search_dirs parameter, so that
load benefits from the searching.
(eval_init): Initialize load_search_dirs_s and register the
*load-search-dirs* special variable.

* eval.h (load_search_dirs_s): Declared.
(load_search_dirs): New macro.

* match.c (v_load): Initialize the variable passed as third
* argument
of open_txr_file.

* parser.c (open_txr_file): Take a new argument, search_dirs.
If this is t, it tells the function "if the path is not found,
then recurse on the *load-search-dirs* variable. Otherwise, if
the value is not t, it is a list of the remaining directories
to try. The existing parameter orig_in_resolved_out must now
point to a location which is initialized. It is assumed to hold
the original target that was passed to the load function.  The
first_try_path is a the path to actually try, derived from that
one.  Thus, the caller of open_txr_file gets to determine the
initial try path using its own algorithm. Then any recursive
calls that go through *load-search-dirs* will pass a first
argument which is made of the original name, combined with a
search dir.
(load_rcfile): Pass pointer to initialized location as third
argument of open-txr_file, and pass a nil value for
search_dirs: no search takes place when looking for that file,
which is at a single, fixed location.

* parser.h (open_txr_file): Declaration updated.

* txr.c (sysroot_init): Initialize *load-search-dirs*.
(txr_main): Ensure third argument in all calls to open_txr_file
points to initialized variable, with the correct value, and
pass t for the search_dirs argument.

* txr.1: Documented.

* stdlib/doc-syms.tl: Updated.

1 files changed, 5 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index ed3c88f7..0915b0b8 100644
--- a/eval.c
+++ b/eval.c
@@ -102,7 +102,7 @@ val vector_lit_s, vec_list_s, tree_lit_s, tree_construct_s;
 val macro_time_s, macrolet_s;
 val defsymacro_s, symacrolet_s, prof_s, switch_s, struct_s;
 val fbind_s, lbind_s, flet_s, labels_s;
-val load_path_s, load_hooks_s, load_recursive_s;
+val load_path_s, load_hooks_s, load_recursive_s, load_search_dirs_s;
 val load_time_s, load_time_lit_s;
 val eval_only_s, compile_only_s;
 val const_foldable_s;
@@ -4669,13 +4669,13 @@ val load(val target)
                  cat_str(nappend2(sub_list(split_str(parent, lit("/")),
                                            zero, negone),
                                   cons(target, nil)), lit("/")));
-  val name, stream;
+  val name = target, stream;
   val txr_lisp_p = t;
   val saved_dyn_env = dyn_env;
   val load_dyn_env = make_env(nil, nil, dyn_env);
   val rec = cdr(lookup_var(nil, load_recursive_s));
 
-  open_txr_file(path, &txr_lisp_p, &name, &stream, self);
+  open_txr_file(path, &txr_lisp_p, &name, &stream, t, self);
 
   if (match_str(or2(get_line(stream), null_string), lit("#!"), nil))
     parser_set_lineno(self, stream, two);
@@ -6751,6 +6751,7 @@ void eval_init(void)
   load_path_s = intern(lit("*load-path*"), user_package);
   load_hooks_s = intern(lit("*load-hooks*"), user_package);
   load_recursive_s = intern(lit("*load-recursive*"), system_package);
+  load_search_dirs_s = intern(lit("*load-search-dirs*"), user_package);
   load_time_s = intern(lit("load-time"), user_package);
   load_time_lit_s  = intern(lit("load-time-lit"), system_package);
   eval_only_s  = intern(lit("eval-only"), user_package);
@@ -7081,6 +7082,7 @@ void eval_init(void)
   reg_var(load_path_s, nil);
   reg_symacro(intern(lit("self-load-path"), user_package), load_path_s);
   reg_var(load_recursive_s, nil);
+  reg_var(load_search_dirs_s, nil);
   reg_var(load_hooks_s, nil);
   reg_fun(intern(lit("expand"), user_package), func_n2o(no_warn_expand, 1));
   reg_fun(intern(lit("expand*"), user_package), func_n2o(expand, 1));