Issue 2808: Allow direction - ^ _ before string indication \1, \2...

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 98ee4ef7028ca97aae685601af97b5d5ccd27eb6..b7d9df12140de7e098fa524a1f9a8d9231220f1c 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -29,9 +29,6 @@
 
 %{
 
-#define YYDEBUG 1
-#define YYERROR_VERBOSE 1
-
 #define yyerror Lily_parser::parser_error
 
 /* We use custom location type: Input objects */
@@ -44,6 +41,8 @@
 
 %parse-param {Lily_parser *parser}
 %lex-param {Lily_parser *parser}
+%error-verbose
+%debug
 
 /* We use SCMs to do strings, because it saves us the trouble of
 deleting them.  Let's hope that a stack overflow doesn't trigger a move
@@ -241,6 +240,7 @@ void set_music_properties (Music *p, SCM a);
 */
 
 /* Keyword tokens with plain escaped name.  */
+%token END_OF_FILE 0 "end of input"
 %token ACCEPTS "\\accepts"
 %token ADDLYRICS "\\addlyrics"
 %token ALIAS "\\alias"
@@ -406,6 +406,7 @@ If we give names, Bison complains.
 %type <scm> music_arg
 %type <scm> music_assign
 %type <scm> music_embedded
+%type <scm> music_or_context_def
 %type <scm> complex_music
 %type <scm> complex_music_prefix
 %type <scm> mode_changed_music
@@ -496,7 +497,6 @@ If we give names, Bison complains.
 %type <scm> identifier_init
 %type <scm> lilypond
 %type <scm> lilypond_header
-%type <scm> lilypond_header_body
 %type <scm> lyric_element
 %type <scm> lyric_element_arg
 %type <scm> lyric_element_music
@@ -565,7 +565,7 @@ start_symbol:
        lilypond
        | EMBEDDED_LILY {
                SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
-               parser->lexer_->push_note_state (alist_to_hashq (nn));
+               parser->lexer_->push_note_state (nn);
        } embedded_lilypond {
                parser->lexer_->pop_state ();
                parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
@@ -587,8 +587,10 @@ lilypond:  /* empty */ { }
 
 
 toplevel_expression:
-       lilypond_header {
-               parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+       {
+               parser->lexer_->add_scope (get_header (parser));
+       } lilypond_header {
+               parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2);
        }
        | book_block {
                Book *book = $1;
@@ -720,10 +722,7 @@ embedded_lilypond:
 
 
 lilypond_header_body:
-       {
-               $$ = get_header (parser);
-               parser->lexer_->add_scope ($$);
-       }
+       /* empty */
        | lilypond_header_body assignment  {
 
        }
@@ -889,7 +888,7 @@ book_body:
                $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
                $$->paper_->unprotect ();
                push_paper (parser, $$->paper_);
-               $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader");
+               $$->header_ = get_header (parser);
                parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
        }
        | BOOK_IDENTIFIER {
@@ -928,9 +927,10 @@ book_body:
                SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
                scm_call_2 (proc, $$->self_scm (), $2);
        }
-       | book_body lilypond_header {
-               $$->header_ = $2;
-       }
+       | book_body
+       {
+               parser->lexer_->add_scope ($1->header_);
+       } lilypond_header
        | book_body embedded_scm { }
        | book_body error {
                $$->paper_ = 0;
@@ -981,9 +981,12 @@ bookpart_body:
                SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
                scm_call_2 (proc, $$->self_scm (), $2);
        }
-       | bookpart_body lilypond_header {
-               $$->header_ = $2;
-       }
+       | bookpart_body
+       {
+               if (!ly_is_module ($1->header_))
+                       $1->header_ = ly_make_module (false);
+               parser->lexer_->add_scope ($1->header_);
+       } lilypond_header
        | bookpart_body embedded_scm { }
        | bookpart_body error {
                $$->paper_ = 0;
@@ -1013,9 +1016,12 @@ score_body:
                $$->protect ();
                $$->origin ()->set_spot (@$);
        }
-       | score_body lilypond_header    {
-               $$->set_header ($2);
-       }
+       | score_body
+       {
+               if (!ly_is_module ($1->get_header ()))
+                       $1->set_header (ly_make_module (false));
+               parser->lexer_->add_scope ($1->get_header ());
+       } lilypond_header
        | score_body output_def {
                if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
                {
@@ -1086,6 +1092,25 @@ output_def_head_with_mode_switch:
        }
        ;
 
+// We need this weird nonterminal because both music as well as a
+// context definition can start with \context and the difference is
+// only apparent after looking at the next token.  If it is '{', there
+// is still time to escape from notes mode.
+
+music_or_context_def:
+       music_arg
+       {
+               parser->lexer_->pop_state ();
+       }
+       | CONTEXT
+       {
+               parser->lexer_->pop_state ();
+       } '{' context_def_spec_body '}'
+       {
+               $$ = $4;
+       }
+       ;
+
 output_def_body:
        output_def_head_with_mode_switch '{' {
                $$ = $1;
@@ -1104,12 +1129,21 @@ output_def_body:
        | output_def_body assignment  {
 
        }
-       | output_def_body context_def_spec_block        {
-               assign_context_def ($$, $2);
-       }
-       | output_def_body music_arg {
-               SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler");
-               scm_call_3 (proc, parser->self_scm (), $1->self_scm (), $2);
+       | output_def_body
+       {
+               SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+               parser->lexer_->push_note_state (nn);
+       } music_or_context_def
+       {
+               if (unsmob_context_def ($3))
+                       assign_context_def ($$, $3);
+               else {
+
+                       SCM proc = parser->lexer_->lookup_identifier
+                                    ("output-def-music-handler");
+                       scm_call_3 (proc, parser->self_scm (),
+                                   $1->self_scm (), $3);
+               }
        }
        | output_def_body error {
 
@@ -1855,14 +1889,14 @@ mode_changed_music:
 mode_changing_head:
        NOTEMODE {
                SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
-               parser->lexer_->push_note_state (alist_to_hashq (nn));
+               parser->lexer_->push_note_state (nn);
 
                $$ = ly_symbol2scm ("notes");
        }
        | DRUMMODE
                {
                SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
-               parser->lexer_->push_note_state (alist_to_hashq (nn));
+               parser->lexer_->push_note_state (nn);
 
                $$ = ly_symbol2scm ("drums");
        }
@@ -1875,7 +1909,7 @@ mode_changing_head:
                SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
                parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
                nn = parser->lexer_->lookup_identifier ("pitchnames");
-               parser->lexer_->push_chord_state (alist_to_hashq (nn));
+               parser->lexer_->push_chord_state (nn);
                $$ = ly_symbol2scm ("chords");
 
        }
@@ -1888,7 +1922,7 @@ mode_changing_head:
 mode_changing_head_with_context:
        DRUMS {
                SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
-               parser->lexer_->push_note_state (alist_to_hashq (nn));
+               parser->lexer_->push_note_state (nn);
 
                $$ = ly_symbol2scm ("DrumStaff");
        }
@@ -1901,7 +1935,7 @@ mode_changing_head_with_context:
                SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
                parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
                nn = parser->lexer_->lookup_identifier ("pitchnames");
-               parser->lexer_->push_chord_state (alist_to_hashq (nn));
+               parser->lexer_->push_chord_state (nn);
                $$ = ly_symbol2scm ("ChordNames");
        }
        | LYRICS
@@ -2345,7 +2379,6 @@ post_event_nofinger:
                }
                $$ = $2;
        }
-       | string_number_event
        | '^' fingering
        {
                $$ = $2;
@@ -2421,6 +2454,7 @@ direction_less_event:
                }
                $$ = m->unprotect ();
        }
+       | string_number_event
        | EVENT_IDENTIFIER      {
                $$ = $1;
        }
@@ -3183,7 +3217,7 @@ simple_markup:
        }
        | SCORE {
                SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
-               parser->lexer_->push_note_state (alist_to_hashq (nn));
+               parser->lexer_->push_note_state (nn);
        } '{' score_body '}' {
                Score * sc = $4;
                $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());