mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 21:40:33 +02:00
Code Activity

(scm_eval_string): Use scm_primitive_eval_x instead

Browse source 
of scm_eval_x to allow module changes between the forms in the
string.  Set/restore module using scm_c_call_with_current_module.
This commit is contained in:
Marius Vollmer 2001-06-02 18:34:48 +00:00
parent c0017a49a5
commit 96e83482fb
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libguile/strports.c
View file

@ -447,6 +447,24 @@ scm_eval_0str (const char *expr)
return scm_eval_string (scm_makfrom0str (expr)); return scm_eval_string (scm_makfrom0str (expr));
} }
static SCM
inner_eval_string (void *data)
{
SCM port = (SCM)data;
SCM form;
SCM ans = SCM_UNSPECIFIED;
/* Read expressions from that port; ignore the values. */
while (!SCM_EOF_OBJECT_P (form = scm_read (port)))
ans = scm_primitive_eval_x (form);
/* Don't close the port here; if we re-enter this function via a
continuation, then the next time we enter it, we'll get an error.
It's a string port anyway, so there's no advantage to closing it
early. */
return ans;
}
SCM_DEFINE (scm_eval_string, "eval-string", 1, 0, 0, SCM_DEFINE (scm_eval_string, "eval-string", 1, 0, 0,
(SCM string), (SCM string),
@ -458,20 +476,8 @@ SCM_DEFINE (scm_eval_string, "eval-string", 1, 0, 0,
{ {
SCM port = scm_mkstrport (SCM_INUM0, string, SCM_OPN | SCM_RDNG, SCM port = scm_mkstrport (SCM_INUM0, string, SCM_OPN | SCM_RDNG,
"scm_eval_0str"); "scm_eval_0str");
SCM form; return scm_c_call_with_current_module (scm_interaction_environment (),
SCM ans = SCM_UNSPECIFIED; inner_eval_string, (void *)port);
SCM module = scm_interaction_environment ();
/* Read expressions from that port; ignore the values. */
while (!SCM_EOF_OBJECT_P (form = scm_read (port)))
ans = scm_eval_x (form, module);
/* Don't close the port here; if we re-enter this function via a
continuation, then the next time we enter it, we'll get an error.
It's a string port anyway, so there's no advantage to closing it
early. */
return ans;
} }
#undef FUNC_NAME #undef FUNC_NAME