summaryrefslogtreecommitdiff
path: root/libguile/load.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-09 16:07:46 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-09 16:15:00 +0100
commit017eb4a6be938c50df7fe6a27ca38486e75e02d5 (patch)
tree7f9815fca5b602ca132598fc7f7ff9793ea8f44d /libguile/load.c
parent9858e529621193222a28b7ee0e53a428aa007363 (diff)
downloadguile-017eb4a6be938c50df7fe6a27ca38486e75e02d5.tar.gz
primitive-load returns the value(s) of the last expression
* libguile/load.c (scm_primitive_load): Return the values yielded from evaluating the last expression in the file. * test-suite/tests/load.test ("return value of `load'"): Add tests.
Diffstat (limited to 'libguile/load.c')
-rw-r--r--libguile/load.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libguile/load.c b/libguile/load.c
index a40031898..007621883 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -87,7 +87,9 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
#define FUNC_NAME s_scm_primitive_load
{
SCM hook = *scm_loc_load_hook;
+ SCM ret = SCM_UNSPECIFIED;
char *encoding;
+
SCM_VALIDATE_STRING (1, filename);
if (scm_is_true (hook) && scm_is_false (scm_procedure_p (hook)))
SCM_MISC_ERROR ("value of %load-hook is neither a procedure nor #f",
@@ -96,8 +98,10 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
if (!scm_is_false (hook))
scm_call_1 (hook, filename);
- { /* scope */
- SCM port = scm_open_file (filename, scm_from_locale_string ("r"));
+ {
+ SCM port;
+
+ port = scm_open_file (filename, scm_from_locale_string ("r"));
scm_dynwind_begin (SCM_F_DYNWIND_REWINDABLE);
scm_i_dynwind_current_load_port (port);
@@ -124,13 +128,13 @@ SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0,
if (SCM_EOF_OBJECT_P (form))
break;
- scm_primitive_eval_x (form);
+ ret = scm_primitive_eval_x (form);
}
scm_dynwind_end ();
scm_close_port (port);
}
- return SCM_UNSPECIFIED;
+ return ret;
}
#undef FUNC_NAME