SCM scopes_;
SCM start_module_;
Input override_input_;
- SCM eval_scm (SCM, char extra_token = 0);
+ SCM eval_scm (SCM, Input, char extra_token = 0);
public:
- SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); }
+ SCM eval_scm_token (SCM sval, Input w)
+ {
+ w.step_forward ();
+ return eval_scm (sval, w, '#');
+ }
SCM extra_tokens_;
SCM *lexval_;
Input *lexloc_;
extern bool parse_protect_global;
extern bool parsed_objects_should_be_dead;
-struct Parse_start
+class Parse_start
{
- char const *str;
- int nchars;
- Input start_location_;
- bool safe_;
- SCM (*func_) (Parse_start *ps);
+public:
SCM form_;
+ Input &location_;
+ bool safe_;
Lily_parser *parser_;
- Parse_start ()
+ Parse_start (SCM form, Input &location, bool safe, Lily_parser *parser) :
+ form_ (form), location_ (location), safe_ (safe), parser_ (parser)
{
- str = 0;
- nchars = 0;
- safe_ = false;
- parser_ = 0;
- form_ = SCM_UNDEFINED;
- func_ = 0;
}
};
SCM catch_protected_parse_body (void *);
SCM protected_ly_parse_scm (Parse_start *, bool);
-SCM ly_parse_scm (char const *, int *, Input, bool, Lily_parser *);
+SCM ly_parse_scm (Input&, bool, Lily_parser *);
SCM ly_eval_scm (SCM, Input, bool, Lily_parser *);
#endif /* PARSE_SCM_HH */
}
}
<incl>(\$|#) { // scm for the filename
- int n = 0;
Input hi = here_input();
hi.step_forward ();
- SCM sval = ly_parse_scm (hi.start (), &n, hi,
- be_safe_global && is_main_input_, parser_);
- sval = eval_scm (sval);
+ SCM sval = ly_parse_scm (hi, be_safe_global && is_main_input_, parser_);
+ sval = eval_scm (sval, hi);
+ int n = hi.end () - hi.start ();
for (int i = 0; i < n; i++)
{
return MULTI_MEASURE_REST;
}
<INITIAL,chords,figures,lyrics,markup,notes># { //embedded scm
- int n = 0;
Input hi = here_input();
hi.step_forward ();
- SCM sval = ly_parse_scm (hi.start (), &n, hi,
- be_safe_global && is_main_input_, parser_);
+ SCM sval = ly_parse_scm (hi, be_safe_global && is_main_input_, parser_);
if (sval == SCM_UNDEFINED)
error_level_ = 1;
+ int n = hi.end () - hi.start ();
for (int i = 0; i < n; i++)
{
yyinput ();
}
<INITIAL,chords,figures,lyrics,markup,notes>\$ { //immediate scm
- int n = 0;
Input hi = here_input();
hi.step_forward ();
- SCM sval = ly_parse_scm (hi.start (), &n, hi,
- be_safe_global && is_main_input_, parser_);
+ SCM sval = ly_parse_scm (hi, be_safe_global && is_main_input_, parser_);
+
+ int n = hi.end () - hi.start ();
for (int i = 0; i < n; i++)
{
}
char_count_stack_.back () += n;
- sval = eval_scm (sval, '$');
+ sval = eval_scm (sval, hi, '$');
int token = scan_scm_id (sval);
if (!scm_is_eq (yylval, SCM_UNSPECIFIED))
// this function is private.
SCM
-Lily_lexer::eval_scm (SCM readerdata, char extra_token)
+Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token)
{
SCM sval = SCM_UNDEFINED;
if (!SCM_UNBNDP (readerdata))
{
- sval = ly_eval_scm (scm_car (readerdata),
- *unsmob_input (scm_cdr (readerdata)),
+ sval = ly_eval_scm (readerdata,
+ hi,
be_safe_global && is_main_input_,
parser_);
}
SCM
internal_ly_parse_scm (Parse_start *ps)
{
- Source_file *sf = ps->start_location_.get_source_file ();
+ Input &hi = ps->location_;
+ Source_file *sf = hi.get_source_file ();
SCM port = sf->get_port ();
- long off = ps->start_location_.start () - sf->c_str ();
+ long off = hi.start () - sf->c_str ();
scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET));
SCM from = scm_ftell (port);
- scm_set_port_line_x (port, scm_from_int (ps->start_location_.line_number () - 1));
- scm_set_port_column_x (port, scm_from_int (ps->start_location_.column_number () - 1));
+ scm_set_port_line_x (port, scm_from_int (hi.line_number () - 1));
+ scm_set_port_column_x (port, scm_from_int (hi.column_number () - 1));
bool multiple = ly_is_equal (scm_peek_char (port), SCM_MAKE_CHAR ('@'));
SCM form = scm_read (port);
SCM to = scm_ftell (port);
- ps->nchars = scm_to_int (to) - scm_to_int (from);
+ hi.set (hi.get_source_file (),
+ hi.start (),
+ hi.start () + scm_to_int (scm_difference (to, from)));
if (!SCM_EOF_OBJECT_P (form))
{
form = scm_list_3 (ly_symbol2scm ("apply"),
ly_symbol2scm ("values"),
form);
- return scm_cons (form, make_input (ps->start_location_));
+ return form;
}
/* Don't close the port here; if we re-enter this function via a
SCM
catch_protected_parse_body (void *p)
{
- Parse_start *ps = (Parse_start *) p;
+ return internal_ly_parse_scm (static_cast<Parse_start *> (p));
+}
- return (*ps->func_) (ps);
+SCM
+catch_protected_eval_body (void *p)
+{
+ return internal_ly_eval_scm (static_cast<Parse_start *> (p));
}
SCM
-parse_handler (void *data, SCM tag, SCM args)
+parse_handler (void *data, SCM /*tag*/, SCM args)
{
Parse_start *ps = (Parse_start *) data;
- ps->start_location_.error (_ ("GUILE signaled an error for the expression beginning here"));
+ ps->location_.error (_ ("GUILE signaled an error for the expression beginning here"));
if (scm_ilength (args) > 2)
scm_display_error_message (scm_cadr (args), scm_caddr (args), scm_current_error_port ());
- if (tag == ly_symbol2scm ("read-error"))
- ps->nchars = 1;
-
return SCM_UNDEFINED;
}
Catch #t : catch all Scheme level errors.
*/
return scm_internal_catch (SCM_BOOL_T,
- &catch_protected_parse_body,
+ catch_protected_parse_body,
+ (void *) ps,
+ &parse_handler, (void *) ps);
+}
+
+SCM
+protected_ly_eval_scm (Parse_start *ps)
+{
+ /*
+ Catch #t : catch all Scheme level errors.
+ */
+ return scm_internal_catch (SCM_BOOL_T,
+ catch_protected_eval_body,
(void *) ps,
&parse_handler, (void *) ps);
}
/* Try parsing. Upon failure return SCM_UNDEFINED. */
SCM
-ly_parse_scm (char const *s, int *n, Input i, bool safe, Lily_parser *parser)
+ly_parse_scm (Input &i, bool safe, Lily_parser *parser)
{
- Parse_start ps;
- ps.str = s;
- ps.start_location_ = i;
- ps.safe_ = safe;
- ps.form_ = SCM_UNDEFINED;
- ps.parser_ = parser;
- ps.func_ = internal_ly_parse_scm;
+ Parse_start ps (SCM_UNDEFINED, i, safe, parser);
SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
: internal_ly_parse_scm (&ps);
- *n = ps.nchars;
return ans;
}
SCM
ly_eval_scm (SCM form, Input i, bool safe, Lily_parser *parser)
{
- Parse_start ps;
- ps.str = 0;
- ps.start_location_ = i;
- ps.safe_ = safe;
- ps.form_ = form;
- ps.parser_ = parser;
- ps.func_ = internal_ly_eval_scm;
+ Parse_start ps (form, i, safe, parser);
- SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
+ SCM ans = parse_protect_global ? protected_ly_eval_scm (&ps)
: internal_ly_eval_scm (&ps);
scm_remember_upto_here_1 (form);
return ans;
}
| SCM_TOKEN {
// Evaluate and ignore #xxx, as opposed to \xxx
- parser->lexer_->eval_scm_token ($1);
+ parser->lexer_->eval_scm_token ($1, @1);
}
| embedded_scm_active
{
embedded_scm_bare:
SCM_TOKEN
{
- $$ = parser->lexer_->eval_scm_token ($1);
+ $$ = parser->lexer_->eval_scm_token ($1, @1);
}
| SCM_IDENTIFIER
;
SCM_ARG
| SCM_TOKEN
{
- $$ = parser->lexer_->eval_scm_token ($1);
+ $$ = parser->lexer_->eval_scm_token ($1, @1);
}
| FRACTION
| full_markup_list
}
| book_body SCM_TOKEN {
// Evaluate and ignore #xxx, as opposed to \xxx
- parser->lexer_->eval_scm_token ($2);
+ parser->lexer_->eval_scm_token ($2, @2);
}
| book_body embedded_scm_active
{
}
| bookpart_body SCM_TOKEN {
// Evaluate and ignore #xxx, as opposed to \xxx
- parser->lexer_->eval_scm_token ($2);
+ parser->lexer_->eval_scm_token ($2, @2);
}
| bookpart_body embedded_scm_active
{