send_stream_event(...); macro should only produce one statement

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

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index f2c0d1863733a4bb8d342f4780d114aa459cdceb..7cfec596c8dff63ca7bdb5a63c3319b5020fb100 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -21,7 +21,6 @@
 
 #include <cctype>
 #include <sstream>
-using namespace std;
 
 #include "context.hh" // for nested_property_alist
 #include "international.hh"
@@ -35,6 +34,9 @@ using namespace std;
 #include "warn.hh"
 #include "program-option.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
+
+using std::string;
 
 static Keyword_ent the_key_tab[]
 =
@@ -56,6 +58,7 @@ static Keyword_ent the_key_tab[]
   {"description", DESCRIPTION},
   {"drummode", DRUMMODE},
   {"drums", DRUMS},
+  {"etc", ETC},
   {"figuremode", FIGUREMODE},
   {"figures", FIGURES},
   {"header", HEADER},
@@ -299,7 +302,7 @@ Lily_lexer::LexerError (char const *s)
     {
       error_level_ |= 1;
       Input spot (*lexloc_);
-      spot.error (s);
+      spot.non_fatal_error (s);
     }
 }
 
@@ -368,7 +371,7 @@ Lily_lexer::add_lexed_char (int count)
 const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
 
 SCM
-Lily_lexer::mark_smob ()
+Lily_lexer::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
@@ -382,7 +385,7 @@ Lily_lexer::mark_smob ()
 }
 
 int
-Lily_lexer::print_smob (SCM port, scm_print_state *)
+Lily_lexer::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Lily_lexer ", port);
   scm_display (scopes_, port);