(DECLARE_BASE_SMOBS): add methods

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 44905a7ce09ef8433b57858658d30397de828fbe..47a25a30020d9fb9d52e0b199a4c926ff1463ffa 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -142,6 +142,7 @@ LYRICS              ({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
 HYPHEN         --
+BOM_UTF8       \357\273\277
 %%
 
 
@@ -149,6 +150,16 @@ HYPHEN             --
        // windows-suck-suck-suck
 }
 
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+  if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+    {
+      LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+      exit (1);
+    }
+  if (be_verbose_global)
+     message (_ ("Skipping UTF-8 BOM"));
+}
+
 <INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{" {
        yy_push_state (longcomment);
@@ -188,8 +199,8 @@ HYPHEN              --
        String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
 
-       yy_pop_state();
-       this->here_input().source_file_->name_ = s;
+       yy_pop_state ();
+       this->here_input().get_source_file ()->name_ = s;
        message (_f ("Renaming input to: `%s'", s.to_str0 ()));
        progress_indication ("\n");
        scm_module_define (scm_car (scopes_),
@@ -278,7 +289,7 @@ HYPHEN              --
        int n = 0;
        Input hi = here_input();
        hi.step_forward ();
-       SCM sval = ly_parse_scm (hi.start_, &n, hi,
+       SCM sval = ly_parse_scm (hi.start (), &n, hi,
                be_safe_global && is_main_input_);
 
        if (sval == SCM_UNDEFINED)
@@ -589,9 +600,9 @@ HYPHEN              --
 
     switch (c) {
     case '>':
-       return E_BIGGER;
+       return E_ANGLE_CLOSE;
     case '<':
-       return E_SMALLER;
+       return E_ANGLE_OPEN;
     case '!':
        return E_EXCLAMATION;
     case '(':
@@ -599,9 +610,9 @@ HYPHEN              --
     case ')':
        return E_CLOSE;
     case '[':
-       return E_LEFTSQUARE;
+       return E_BRACKET_OPEN;
     case ']':
-       return E_RIGHTSQUARE;
+       return E_BRACKET_CLOSE;
     case '~':
        return E_TILDE;
     case '\\':