* load.c (scm_primitive_load, scm_primitive_load_path): Renamed

from scm_sys_try_load and scm_sys_try_load_path.  The Scheme name
of scm_primitive_load_path was also changed to
"primitive-load-path", from "%try-load-path".  Callers changed.
We'd like to respect the convention that a function named
"try-mumble" should behave just like the function called "mumble",
but return #f instead of signalling some error.
* load.h: Rename prototypes.

diff --git a/libguile/load.c b/libguile/load.c
index f0390ec..a4527af 100644 (file)
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -63,9 +63,9 @@
 \f
 /* Loading a file, given an absolute filename.  */
 
-SCM_PROC(s_sys_try_load, "primitive-load", 1, 2, 0, scm_sys_try_load);
+SCM_PROC(s_sys_try_load, "primitive-load", 1, 2, 0, scm_primitive_load);
 SCM 
-scm_sys_try_load (filename, case_insensitive_p, sharp)
+scm_primitive_load (filename, case_insensitive_p, sharp)
      SCM filename;
      SCM case_insensitive_p;
      SCM sharp;
@@ -197,9 +197,9 @@ scm_sys_search_load_path (filename)
 }
 
 
-SCM_PROC(s_sys_try_load_path, "%try-load-path", 1, 2, 0,scm_sys_try_load_path);
+SCM_PROC(s_sys_try_load_path, "primitive-load-path", 1, 2, 0,scm_primitive_load_path);
 SCM 
-scm_sys_try_load_path (filename, case_insensitive_p, sharp)
+scm_primitive_load_path (filename, case_insensitive_p, sharp)
      SCM filename;
      SCM case_insensitive_p;
      SCM sharp;
@@ -213,7 +213,7 @@ scm_sys_try_load_path (filename, case_insensitive_p, sharp)
                 scm_listify (filename, *scm_loc_load_path, SCM_UNDEFINED),
                 SCM_BOOL_F);
     }
-  return scm_sys_try_load (full_filename, case_insensitive_p, sharp);
+  return scm_primitive_load (full_filename, case_insensitive_p, sharp);
 }
 
 \f

diff --git a/libguile/load.h b/libguile/load.h
index a1d37ab..ef7cb88 100644 (file)
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -47,9 +47,10 @@
 
 \f
 extern void scm_init_load_path SCM_P ((void));
-extern SCM scm_sys_try_load SCM_P ((SCM filename, SCM casep, SCM sharp));
+extern SCM scm_primitive_load SCM_P ((SCM filename, SCM casep, SCM sharp));
 extern SCM scm_sys_search_load_path SCM_P ((SCM filename));
-extern SCM scm_sys_try_load_path SCM_P ((SCM filename, SCM casep, SCM sharp));
+extern SCM scm_primitive_load_path SCM_P ((SCM filename, SCM casep,
+                                          SCM sharp));
 extern void scm_init_load SCM_P ((void));
 
 #endif  /* LOADH */