mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-11 14:21:10 +02:00
* 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.
This commit is contained in:
parent
352a1ccedb
commit
b9d5d65460
2 changed files with 8 additions and 7 deletions
|
@ -63,9 +63,9 @@
|
||||||
|
|
||||||
/* Loading a file, given an absolute filename. */
|
/* 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
|
||||||
scm_sys_try_load (filename, case_insensitive_p, sharp)
|
scm_primitive_load (filename, case_insensitive_p, sharp)
|
||||||
SCM filename;
|
SCM filename;
|
||||||
SCM case_insensitive_p;
|
SCM case_insensitive_p;
|
||||||
SCM sharp;
|
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
|
||||||
scm_sys_try_load_path (filename, case_insensitive_p, sharp)
|
scm_primitive_load_path (filename, case_insensitive_p, sharp)
|
||||||
SCM filename;
|
SCM filename;
|
||||||
SCM case_insensitive_p;
|
SCM case_insensitive_p;
|
||||||
SCM sharp;
|
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_listify (filename, *scm_loc_load_path, SCM_UNDEFINED),
|
||||||
SCM_BOOL_F);
|
SCM_BOOL_F);
|
||||||
}
|
}
|
||||||
return scm_sys_try_load (full_filename, case_insensitive_p, sharp);
|
return scm_primitive_load (full_filename, case_insensitive_p, sharp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,10 @@
|
||||||
|
|
||||||
|
|
||||||
extern void scm_init_load_path SCM_P ((void));
|
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_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));
|
extern void scm_init_load SCM_P ((void));
|
||||||
|
|
||||||
#endif /* LOADH */
|
#endif /* LOADH */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue