Fix 1598.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 176b4a08777375b8b17332cc8828283f931feb1b..02c99e2f42e8f4eb7cf3283a764369ccac3770d7 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -187,7 +187,7 @@ void set_music_properties (Music *p, SCM a);
 %token FIGURES "\\figures"
 %token GROBDESCRIPTIONS "\\grobdescriptions"
 %token HEADER "\\header"
-%token INVALID "\\invalid"
+%token INVALID "\\version-error"
 %token KEY "\\key"
 %token LAYOUT "\\layout"
 %token LYRICMODE "\\lyricmode"
@@ -199,11 +199,9 @@ void set_music_properties (Music *p, SCM a);
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
-%token OCTAVE "\\octave"
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
 %token PAPER "\\paper"
-%token PARTIAL "\\partial"
 %token RELATIVE "\\relative"
 %token REMOVE "\\remove"
 %token REPEAT "\\repeat"
@@ -213,10 +211,8 @@ void set_music_properties (Music *p, SCM a);
 %token SEQUENTIAL "\\sequential"
 %token SET "\\set"
 %token SIMULTANEOUS "\\simultaneous"
-%token SKIP "\\skip"
 %token TEMPO "\\tempo"
 %token TIMES "\\times"
-%token TRANSPOSE "\\transpose"
 %token TYPE "\\type"
 %token UNSET "\\unset"
 %token WITH "\\with"
@@ -263,7 +259,6 @@ If we give names, Bison complains.
 %token MULTI_MEASURE_REST
 
 
-%token <i> DIGIT
 %token <i> E_UNSIGNED
 %token <i> UNSIGNED
 
@@ -287,6 +282,7 @@ If we give names, Bison complains.
 %token <scm> CONTEXT_DEF_IDENTIFIER
 %token <scm> CONTEXT_MOD_IDENTIFIER
 %token <scm> DRUM_PITCH
+%token <scm> PITCH_IDENTIFIER
 %token <scm> DURATION_IDENTIFIER
 %token <scm> EVENT_IDENTIFIER
 %token <scm> FRACTION
@@ -349,10 +345,12 @@ If we give names, Bison complains.
 %type <scm> direction_reqd_event
 %type <scm> embedded_lilypond
 %type <scm> event_chord
+%type <scm> fingering
 %type <scm> gen_text_def
 %type <scm> music_property_def
 %type <scm> note_chord_element
 %type <scm> post_event
+%type <scm> post_event_nofinger
 %type <scm> re_rhythmed_music
 %type <scm> relative_music
 %type <scm> simple_element
@@ -477,7 +475,7 @@ start_symbol:
                PARSER->lexer_->push_note_state (alist_to_hashq (nn));
        } embedded_lilypond {
                PARSER->lexer_->pop_state ();
-               PARSER->lexer_->set_identifier (ly_symbol2scm ("$parseStringResult"), $3);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
        }
        ;
 
@@ -584,7 +582,7 @@ embedded_lilypond:
        | error {
                PARSER->error_level_ = 1;
        }
-       | embedded_lilypond INVALID     {
+       | INVALID embedded_lilypond {
                PARSER->error_level_ = 1;
        }
        ;
@@ -666,7 +664,7 @@ identifier_init:
                else
                        $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
        }
-       | post_event {
+       | post_event_nofinger {
                $$ = $1;
        }
        | number_expression {
@@ -684,9 +682,6 @@ identifier_init:
        | full_markup_list {
                $$ = $1;
        }
-       | DIGIT {
-               $$ = scm_from_int ($1);
-       }
         | context_modification {
                 $$ = $1;
         }
@@ -1178,8 +1173,7 @@ function_arglist_nonmusic_last:
 generic_prefix_music_scm:
        MUSIC_FUNCTION function_arglist {
                $$ = run_music_function (PARSER, @$,
-                                        $1,
-                                        scm_reverse_x ($2, SCM_EOL));
+                                        $1, $2);
        }
        ;
 
@@ -1213,12 +1207,6 @@ prefix_composite_music:
                 $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3);
        }
        | repeated_music                { $$ = $1; }
-       | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music {
-               Pitch from = *unsmob_pitch ($2);
-               Pitch to = *unsmob_pitch ($3);
-               SCM pitch = pitch_interval (from, to).smobbed_copy ();
-               $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4);
-       }
        | mode_changing_head grouped_music_list {
                if ($1 == ly_symbol2scm ("chords"))
                {
@@ -1510,9 +1498,6 @@ closed_scalar: string {
        | full_markup {
                $$ = $1;
        }
-       | DIGIT {
-               $$ = scm_from_int ($1);
-       }
        ;
 
 scalar: closed_scalar
@@ -1648,7 +1633,7 @@ music_function_chord_body_arglist:
 music_function_chord_body:
        MUSIC_FUNCTION music_function_chord_body_arglist {
                $$ = run_music_function (PARSER, @$,
-                                        $1, scm_reverse_x ($2, SCM_EOL));
+                                        $1, $2);
        }
        ;
 
@@ -1667,7 +1652,7 @@ music_function_event_arglist:
 music_function_event:
        MUSIC_FUNCTION music_function_event_arglist {
                $$ = run_music_function (PARSER, @$,
-                                        $1, scm_reverse_x ($2, SCM_EOL));
+                                        $1, $2);
        }
        ;
 
@@ -1675,9 +1660,6 @@ command_element:
        command_event {
                $$ = $1;
        }
-       | SKIP duration_length {
-               $$ = MAKE_SYNTAX ("skip-music", @$, $2);
-       }
        | E_BRACKET_OPEN {
                Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
                m->set_property ("span-direction", scm_from_int (START));
@@ -1705,10 +1687,6 @@ command_element:
                        $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
 
        }
-       | PARTIAL duration_length       {
-               $$ = MAKE_SYNTAX ("partial", @$, $2);
-       }
-
        | TIME_T fraction  {
                SCM proc = ly_lily_module_constant ("make-time-signature-set");
 
@@ -1761,7 +1739,7 @@ post_events:
        }
        ;
 
-post_event:
+post_event_nofinger:
        direction_less_event {
                $$ = $1;
        }
@@ -1801,6 +1779,18 @@ post_event:
        | string_number_event
        ;
 
+post_event:
+       post_event_nofinger
+       | script_dir fingering {
+               if ($1)
+               {
+                       Music *m = unsmob_music ($2);
+                       m->set_property ("direction", scm_from_int ($1));
+               }
+               $$ = $2;
+       }
+       ;
+
 string_number_event:
        E_UNSIGNED {
                Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
@@ -1947,6 +1937,7 @@ pitch:
        steno_pitch {
                $$ = $1;
        }
+       | PITCH_IDENTIFIER
        ;
 
 pitch_also_in_chords:
@@ -1966,7 +1957,10 @@ gen_text_def:
                        make_simple_markup ($1));
                $$ = t->unprotect ();
        }
-       | DIGIT {
+       ;
+
+fingering:
+       UNSIGNED {
                Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
                t->set_property ("digit", scm_from_int ($1));
                $$ = t->unprotect ();
@@ -2005,7 +1999,7 @@ script_dir:
 
 
 absolute_pitch:
-       steno_pitch     {
+       pitch   {
                $$ = $1;
        }
        ;
@@ -2088,10 +2082,7 @@ tremolo_type:
        ;
 
 bass_number:
-       DIGIT   {
-               $$ = scm_from_int ($1);
-       }
-       | UNSIGNED {
+       UNSIGNED {
                $$ = scm_from_int ($1);
        }
        | STRING { $$ = $1; }
@@ -2421,9 +2412,6 @@ bare_unsigned:
        UNSIGNED {
                        $$ = $1;
        }
-       | DIGIT {
-               $$ = $1;
-       }
        ;
 
 unsigned_number:
@@ -2685,6 +2673,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 
                mus->unprotect ();
                return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+       } else if (unsmob_pitch (sid)) {
+               *destination = unsmob_pitch (sid)->smobbed_copy ();
+               return PITCH_IDENTIFIER;
        } else if (unsmob_duration (sid)) {
                *destination = unsmob_duration (sid)->smobbed_copy ();
                return DURATION_IDENTIFIER;
@@ -2732,14 +2723,16 @@ run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args)
 
        SCM type_check_proc = ly_lily_module_constant ("type-check-list");
 
+       args = scm_reverse_x (args, SCM_EOL);
+
        if (!to_boolean (scm_call_3  (type_check_proc, make_input (loc), scm_cdr (sig), args)))
        {
                parser->error_level_ = 1;
                return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (loc)));
        }
 
-       SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (loc), func, args);
-       return LOWLEVEL_MAKE_SYNTAX (scm_car (sig), syntax_args);
+       SCM syntax_args = scm_list_5 (parser->self_scm (), make_input (loc), scm_car (sig), func, args);
+       return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args);
 }
 
 bool