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

* load.c (scm_sys_try_load): don't check whether value returned

Browse source 
by scm_open_file is #f, it won't be.  Always return SCM_UNSPECIFIED.
Change the Scheme name from %try-load to primitive-load.

* error.c (scm_error): convert a NULL message to SCM_BOOL_F.
Can avoid passing a message, allowing it to be derived in the
error handler (e.g., if we want to throw to the key both from
Scheme and C).
This commit is contained in:
Gary Houston 1996-09-24 07:21:17 +00:00
parent 855c0eacc8
commit b59b97ba3a
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/ChangeLog
View file

@ -1,3 +1,14 @@
Tue Sep 24 06:48:38 1996 Gary Houston <ghouston@actrix.gen.nz>
* load.c (scm_sys_try_load): don't check whether value returned
by scm_open_file is #f, it won't be. Always return SCM_UNSPECIFIED.
Change the Scheme name from %try-load to primitive-load.
* error.c (scm_error): convert a NULL message to SCM_BOOL_F.
Can avoid passing a message, allowing it to be derived in the
error handler (e.g., if we want to throw to the key both from
Scheme and C).
Mon Sep 23 00:42:15 1996 Mikael Djurfeldt <mdj@kenneth> Mon Sep 23 00:42:15 1996 Mikael Djurfeldt <mdj@kenneth>
* * print.c (scm_iprin1, scm_prin1, scm_iprlist): Circular * * print.c (scm_iprin1, scm_prin1, scm_iprlist): Circular

2
libguile/error.c
View file

@ -137,7 +137,7 @@ scm_error (key, subr, message, args, rest)
(*scm_error_callback) (key, subr, message, args, rest); (*scm_error_callback) (key, subr, message, args, rest);
arg_list = scm_listify (subr ? scm_makfrom0str (subr) : SCM_BOOL_F, arg_list = scm_listify (subr ? scm_makfrom0str (subr) : SCM_BOOL_F,
scm_makfrom0str (message), message ? scm_makfrom0str (message) : SCM_BOOL_F,
args, args,
rest, rest,
SCM_UNDEFINED); SCM_UNDEFINED);

6
libguile/load.c
View file

@ -63,7 +63,7 @@
/* Loading a file, given an absolute filename. */ /* Loading a file, given an absolute filename. */
SCM_PROC(s_sys_try_load, "%try-load", 1, 2, 0, scm_sys_try_load); SCM_PROC(s_sys_try_load, "primitive-load", 1, 2, 0, scm_sys_try_load);
SCM SCM
scm_sys_try_load (filename, case_insensitive_p, sharp) scm_sys_try_load (filename, case_insensitive_p, sharp)
SCM filename; SCM filename;
@ -76,8 +76,6 @@ scm_sys_try_load (filename, case_insensitive_p, sharp)
SCM form, port; SCM form, port;
port = scm_open_file (filename, port = scm_open_file (filename,
scm_makfromstr ("r", (scm_sizet) sizeof (char), 0)); scm_makfromstr ("r", (scm_sizet) sizeof (char), 0));
if (SCM_FALSEP (port))
return SCM_BOOL_F;
while (1) while (1)
{ {
form = scm_read (port, case_insensitive_p, sharp); form = scm_read (port, case_insensitive_p, sharp);
@ -87,7 +85,7 @@ scm_sys_try_load (filename, case_insensitive_p, sharp)
} }
scm_close_port (port); scm_close_port (port);
} }
return SCM_BOOL_T; return SCM_UNSPECIFIED;
} }