release: 1.1.26

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 551cf48aec682c7a4f755e35fae5912a76c05bf6..e2de809d0196bf0bbaad96d5c101fc2377963f9f 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -62,6 +62,7 @@ LYRICS                ({AA}|{TEX})[^0-9 \t\n\f]*
 %option never-interactive 
 %option warn
 
+%x chords
 %x incl
 %x lyrics
 %x notes
@@ -91,9 +92,7 @@ RESTNAME      [rs]
 NOTECOMMAND    \\{A}+
 LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
 ESCAPED                [nt\\'"]
-PLET           \\\[
-TELP           \\\]
-EXTENDER       [_][_]
+EXTENDER       __
 
 %%
 
@@ -102,7 +101,7 @@ EXTENDER    [_][_]
        // windows-suck-suck-suck
 }
 
-<notes,incl,INITIAL,lyrics>{
+<INITIAL,chords,incl,lyrics,notes>{
   "%{" {
        yy_push_state (longcomment);
   }
@@ -136,11 +135,17 @@ EXTENDER  [_][_]
 }
 
 
-<notes,INITIAL,lyrics>\\maininput           {
-       start_main_input ();
+<INITIAL,chords,lyrics,notes>\\maininput           {
+       if (!main_input_b_)
+       {
+               start_main_input ();
+               main_input_b_ = true;
+       }
+       else
+               error ("\\maininput disallowed outside init files.");
 }
 
-<notes,INITIAL,lyrics>\\include           {
+<INITIAL,chords,lyrics,notes>\\include           {
        yy_push_state (incl);
 }
 <incl>\"[^"]*\";?   { /* got the include file name */
@@ -184,29 +189,27 @@ EXTENDER  [_][_]
 <notes>R               {
        return MEASURES;
 }
-<INITIAL,lyrics,notes>\\\${BLACK}*{WHITE}      {
+<INITIAL,chords,lyrics,notes>\\\${BLACK}*{WHITE}       {
        String s=YYText () + 2;
        s=s.left_str (s.length_i () - 1);
        return scan_escaped_word (s); 
 }
-<INITIAL,lyrics,notes>\${BLACK}*{WHITE}                {
+<INITIAL,chords,lyrics,notes>\${BLACK}*{WHITE}         {
        String s=YYText () + 1;
        s=s.left_str (s.length_i () - 1);
        return scan_bare_word (s);
 }
-<INITIAL,lyrics,notes>\\\${BLACK}*             { // backup rule
+<INITIAL,chords,lyrics,notes>\\\${BLACK}*              { // backup rule
        cerr << _ ("white expected") << endl;
        exit (1);
 }
-<INITIAL,lyrics,notes>\${BLACK}*               { // backup rule
+<INITIAL,chords,lyrics,notes>\${BLACK}*                { // backup rule
        cerr << _ ("white expected") << endl;
        exit (1);
 }
 <notes>{
-
        {ALPHAWORD}     {
                return scan_bare_word (YYText ());
-
        }
 
        {NOTECOMMAND}   {
@@ -249,7 +252,6 @@ EXTENDER    [_][_]
 }
 
 <lyrics>{
-
        \" {
                start_quote ();
        }
@@ -281,6 +283,21 @@ EXTENDER   [_][_]
                return yylval.c = YYText ()[0];
        }
 }
+<chords>{
+       {ALPHAWORD}     {
+               return scan_bare_word (YYText ());
+       }
+       {NOTECOMMAND}   {
+               return scan_escaped_word (YYText () + 1);
+       }
+       {UNSIGNED}              {
+               yylval.i = String_convert::dec2_i (String (YYText ()));
+               return UNSIGNED;
+       }
+       . {
+               return yylval.c = YYText ()[0];
+       }
+}
 
 <<EOF>> {
        DOUT << "<<eof>>";
@@ -322,14 +339,6 @@ EXTENDER   [_][_]
        return c;
 }
 
-<lyrics,notes>{PLET}   {
-       return yylval.i = PLET;
-}
-
-<lyrics,notes>{TELP}   {
-       return yylval.i = TELP;
-}
-
 <INITIAL,notes>.       {
        return yylval.c = YYText ()[0];
 }
@@ -363,11 +372,18 @@ My_lily_lexer::push_note_state ()
        yy_push_state (notes);
 }
 
+void
+My_lily_lexer::push_chord_state ()
+{
+       yy_push_state (chords);
+}
+
 void
 My_lily_lexer::push_lyric_state ()
 {
        yy_push_state (lyrics);
 }
+
 void
 My_lily_lexer::pop_state ()
 {
@@ -389,14 +405,13 @@ My_lily_lexer::scan_escaped_word (String str)
                yylval.id = id;
                return id->token_code_i_;
        }
-       if (YYSTATE != notes) {
-               if (notename_b (str))
-                       {
-                       yylval.pitch = new Musical_pitch (lookup_pitch (str));
+       if ((YYSTATE != notes) && (YYSTATE != chords)) {
+               if (notename_b (str)) {
+                       yylval.pitch = new Musical_pitch (lookup_notename (str));
                        yylval.pitch->set_spot (Input (source_file_l (), 
                          here_ch_C ()));
                        return NOTENAME_PITCH;
-                       }
+               }
        }
        if (check_debug)
                print_declarations (true);
@@ -412,13 +427,19 @@ int
 My_lily_lexer::scan_bare_word (String str)
 {
        DOUT << "word: `" << str<< "'\n";       
-       if (YYSTATE == notes){
+       if ((YYSTATE == notes) || (YYSTATE == chords)) {
                if (notename_b (str)) {
                    DOUT << "(notename)\n";
-                   yylval.pitch = new Musical_pitch (lookup_pitch (str));
+                   yylval.pitch = new Musical_pitch (lookup_notename (str));
+                   yylval.pitch->set_spot (Input (source_file_l (), 
+                     here_ch_C ()));
+                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+               } else if (chordmodifier_b (str)) {
+                   DOUT << "(chordmodifier)\n";
+                   yylval.pitch = new Musical_pitch (lookup_chordmodifier (str));
                    yylval.pitch->set_spot (Input (source_file_l (), 
                      here_ch_C ()));
-                   return NOTENAME_PITCH;
+                   return CHORDMODIFIER_PITCH;
                }
        }
 
@@ -432,6 +453,12 @@ My_lily_lexer::note_state_b () const
        return YY_START == notes;
 }
 
+bool
+My_lily_lexer::chord_state_b () const
+{
+       return YY_START == chords;
+}
+
 bool
 My_lily_lexer::lyric_state_b () const
 {