X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=6db0e653e5480d224427df3488bd12ae5c1a3bb5;hb=9ead371f45f0a0c98e86e8e32eb86ef75c3af5a4;hp=3bb7921b2b89d9d5356ec8e4c80edb0f8d177f20;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git
diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 3bb7921b2b..6db0e653e5 100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -35,6 +35,7 @@ using namespace std;
#include "warn.hh"
#include "program-option.hh"
#include "lily-parser.hh"
+#include "ly-module.hh"
static Keyword_ent the_key_tab[]
=
@@ -56,6 +57,7 @@ static Keyword_ent the_key_tab[]
{"description", DESCRIPTION},
{"drummode", DRUMMODE},
{"drums", DRUMS},
+ {"etc", ETC},
{"figuremode", FIGUREMODE},
{"figures", FIGURES},
{"header", HEADER},
@@ -123,8 +125,8 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src, Lily_parser *parser,
main_input_level_ = 0;
extra_tokens_ = SCM_EOL;
- if (Input::is_smob (override_input))
- override_input_ = *Input::unsmob (override_input);
+ if (unsmob (override_input))
+ override_input_ = *unsmob (override_input);
smobify_self ();
@@ -283,6 +285,8 @@ Lily_lexer::set_identifier (SCM path, SCM val)
SCM prev = ly_module_lookup (mod, sym);
if (scm_is_true (prev))
val = nested_property_alist (scm_variable_ref (prev), path, val);
+ else
+ val = nested_create_alist (path, val);
}
scm_module_define (mod, sym, val);
}
@@ -299,7 +303,7 @@ Lily_lexer::LexerError (char const *s)
{
error_level_ |= 1;
Input spot (*lexloc_);
- spot.error (s);
+ spot.non_fatal_error (s);
}
}
@@ -365,10 +369,10 @@ Lily_lexer::add_lexed_char (int count)
}
-const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?";
+const char * const 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 +386,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 ("#