+#include <stdio.h>
#include "lily-guile.hh"
#include "parse-scm.hh"
#include "string.hh"
-
+#include "source-file.hh"
/*
Pass string to scm parser, evaluate one expression.
SCM
internal_ly_parse_scm (Parse_start * ps)
{
- /*
-
- This is actually pretty wasteful: we stuff the rest of the entire
- file down GUILE, while we usually need only a bit of it.
-
- TODO: implement read_only_string_port(), (preferably in GUILE ?)
-
- */
- SCM str = scm_makfrom0str (ps->str);
- SCM port = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
- "ly_eval_scm_0str");
+ Source_file* sf =ps->start_location_.source_file_;
+ SCM port = sf->get_port();
- scm_set_port_filename_x (port, scm_makfrom0str (ps->start_location.file_string ().get_str0()));
- scm_set_port_line_x (port, gh_int2scm (ps->start_location.line_number ()));
- scm_set_port_column_x (port, gh_int2scm (ps->start_location.column_number()));
+ int off = ps->start_location_.defined_str0_ - sf->to_str0();
+ scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
SCM from = scm_ftell (port);
SCM form;
{
Parse_start* ps = (Parse_start*) data;
- ps->start_location.error (_("GUILE signaled an error for the expression begining here"));
+ 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());
*/
ps->nchars = 1;
- return SCM_EOL;
+ return SCM_UNDEFINED;
}
/*
&catch_protected_parse_body,
(void*)ps,
&parse_handler, (void*)ps);
-
}
+bool parse_protect_global = true;
+/*
+ Try parsing. If failure, then return SCM_UNDEFINED.
+ */
SCM
ly_parse_scm (char const* s, int *n, Input i)
{
+
Parse_start ps ;
ps.str = s;
- ps.start_location = i;
+ ps.start_location_ = i;
- SCM ans = protected_ly_parse_scm (&ps);
+ SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
+ : internal_ly_parse_scm (&ps);
*n = ps.nchars;
+
return ans;
}