Release: bump Welcome versions.

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 93d9a055c7fec9dd563190425a2fcad03c73e962..d2499d4c4134c1453cc0a9b1a8618282df26da33 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -77,14 +77,14 @@ Lily_parser::~Lily_parser ()
 }
 
 SCM
-Lily_parser::mark_smob ()
+Lily_parser::mark_smob () const
 {
   scm_gc_mark (closures_);
   return (lexer_) ? lexer_->self_scm () : SCM_EOL;
 }
 
 int
-Lily_parser::print_smob (SCM port, scm_print_state *)
+Lily_parser::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Lily_parser ", port);
   if (lexer_)
@@ -189,18 +189,18 @@ Lily_parser::clear ()
 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;
 }
 
-const char Lily_parser::type_p_name_[] = "ly:lily-parser?";
+const char * const Lily_parser::type_p_name_ = "ly:lily-parser?";
 
 /****************************************************************
   OUTPUT-DEF