Thanks to Gary Houston <ghouston@freewire.co.uk> */
SCM
-internal_ly_parse_scm (Parse_start * ps, bool safe)
+internal_ly_parse_scm (Parse_start * ps)
{
Source_file* sf =ps->start_location_.source_file_;
SCM port = sf->get_port ();
/* Read expression from port */
if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
{
- if (safe)
- {
- static SCM safe_module;
- if (!safe_module)
- {
- safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module"));
- if (output_format_global == PAGE_LAYOUT)
- ly_import_module (safe_module, scm_c_resolve_module ("lily"));
- }
- answer = scm_eval (form, safe_module);
- }
+ if (ps->safe_)
+ answer = scm_eval (form,
+ scm_call_0 (ly_scheme_function ("make-safe-lilypond-module")));
else
answer = scm_primitive_eval (form);
}
Shouldn't scm_read () do this for us? */
scm_fill_input (port);
SCM to = scm_ftell (port);
- ps->nchars = gh_scm2int (to) - gh_scm2int (from);
+ ps->nchars = ly_scm2int (to) - ly_scm2int (from);
/* 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.
catch_protected_parse_body (void *p)
{
Parse_start *ps = (Parse_start*) p;
- return internal_ly_parse_scm (ps, false);
-}
-
-SCM
-safe_catch_protected_parse_body (void *p)
-{
- Parse_start *ps = (Parse_start*) p;
- return internal_ly_parse_scm (ps, true);
+
+ return internal_ly_parse_scm (ps);
}
SCM
ps->start_location_.error (_("GUILE signaled an error for the expression beginning here"));
if (scm_ilength (args) > 2)
- scm_display_error_message (gh_cadr (args), gh_caddr (args), scm_current_error_port ());
+ scm_display_error_message (ly_cadr (args), ly_caddr (args), scm_current_error_port ());
/*
The following is a kludge; we should probably search for
#endif
SCM
-protected_ly_parse_scm (Parse_start *ps, bool safe)
+protected_ly_parse_scm (Parse_start *ps)
{
return scm_internal_catch (ly_symbol2scm (READ_ERROR),
- (safe ? &safe_catch_protected_parse_body
- : catch_protected_parse_body),
+ &catch_protected_parse_body,
(void*) ps,
&parse_handler, (void*) ps);
}
Parse_start ps ;
ps.str = s;
ps.start_location_ = i;
-
- SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps, safe)
- : internal_ly_parse_scm (&ps, safe);
+ ps.safe_ = safe;
+
+ SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
+ : internal_ly_parse_scm (&ps);
*n = ps.nchars;
return ans;