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, 2 insertions, 2 deletions

diff --git a/match.c b/match.c
index 81cf7c8d..9d5a0a6b 100644
--- a/match.c
+++ b/match.c
@@ -4609,14 +4609,14 @@ static val v_load(match_files_ctx *c)
                    cat_str(nappend2(sub_list(split_str(parent, lit("/")),
                                          zero, negone),
                                     cons(target, nil)), lit("/")));
-    val stream, name;
+    val stream, name = target;
     val txr_lisp_p = nil;
     val ret = nil;
     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);
 
     uw_simple_catch_begin;