]> git.donarmstrong.com Git - lilypond.git/commitdiff
allow identifiers as repeat count as well.
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 31 Dec 2006 13:33:43 +0000 (14:33 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 31 Dec 2006 13:44:06 +0000 (14:44 +0100)
lily/parser.yy

index 2d9cbdf99225808914c53d2287890637a564eaf1..8faa4575161eb3692202b3dd1bb76b20a18c49aa 100644 (file)
@@ -351,6 +351,7 @@ If we give names, Bison complains.
 %type <scm> absolute_pitch
 %type <scm> assignment_id
 %type <scm> bare_number
+%type <scm> unsigned_number
 %type <scm> bass_figure
 %type <scm> figured_bass_modification
 %type <scm> br_bass_figure
@@ -855,9 +856,9 @@ alternative_music:
 
 
 repeated_music:
-       REPEAT simple_string bare_unsigned music alternative_music
+       REPEAT simple_string unsigned_number music alternative_music
        {
-               $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5);
+               $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5);
        }
        ;
 
@@ -2135,6 +2136,14 @@ bare_unsigned:
        }
        ;
 
+unsigned_number:
+       bare_unsigned  { $$ = scm_from_int ($1); }
+       | NUMBER_IDENTIFIER {
+               $$ = $1;
+       }
+       ;
+       
+
 exclamations:
                { $$ = 0; }
        | exclamations '!'      { $$ ++; }