void
Lily_parser::parser_error (const string &s)
{
- lexer_->here_input ().error (_ (s.c_str ()));
+ lexer_->here_input ().non_fatal_error (_ (s.c_str ()));
error_level_ = 1;
}
void
Lily_parser::parser_error (Input const &i, const string &s)
{
- i.error (s);
+ i.non_fatal_error (s);
error_level_ = 1;
}
{
Parse_start *ps = (Parse_start *) data;
- ps->location_.error (_ ("GUILE signaled an error for the expression beginning here"));
+ ps->location_.non_fatal_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 (unsmob<Music> (music_))
{
- unsmob<Music> (music)->origin ()->error (_ ("already have music in score"));
- unsmob<Music> (music_)->origin ()->error (_ ("this is the previous music"));
+ unsmob<Music> (music)->origin ()->non_fatal_error
+ (_ ("already have music in score"));
+ unsmob<Music> (music_)->origin ()->non_fatal_error
+ (_ ("this is the previous music"));
}
Music *m = unsmob<Music> (music);
if (m && to_boolean (m->get_property ("error-found")))
{
- m->origin ()->error (_ ("errors found, ignoring music expression"));
+ m->origin ()->non_fatal_error
+ (_ ("errors found, ignoring music expression"));
- this->error_found_ = this->error_found_
- || to_boolean (m->get_property ("error-found"));
+ error_found_ = true;
}
- if (this->error_found_)
- this->music_ = SCM_EOL;
+ if (error_found_)
+ music_ = SCM_EOL;
else
- this->music_ = music;
+ music_ = music;
}
SCM