(finish_primitive): compile fixes.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 402a0fc802510f3d521cacccadcfc28b66f374a9..d6a3f997d0e3af8f65fc83af9664f53c7b068487 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -5,7 +5,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -262,6 +262,8 @@ yylex (YYSTYPE *s,  void * v)
 %token <scm>   DURATION_IDENTIFIER
 %token <scm>    FRACTION
 %token <id>    IDENTIFIER
+%token <scm>   CHORDNAMES CHORDNAMES_IDENTIFIER
+%type <scm>    chordnames_block chordnames_list chord_scm
 
 
 %token <scm>   SCORE_IDENTIFIER
@@ -404,7 +406,6 @@ notenames_body:
                else
                        scm_hashq_set_x (tab, ly_caar (s), pt);
          }
-
          $$ = tab;
        }
        ;
@@ -495,8 +496,39 @@ identifier_init:
        | embedded_scm  {
                $$ = $1;
        }
+       | chordnames_block {
+               $$ = $1;
+       }       
+       ;
+
+chordnames_block:
+       CHORDNAMES '{'
+               { THIS->lexer_->push_chord_state (); }
+               chordnames_list
+               { THIS->lexer_->pop_state (); }
+       '}'
+       {
+               $$ = $4;
+       }
        ;
 
+chordnames_list:
+       /* empty */ {
+               $$ = SCM_EOL;
+       }
+       | CHORDNAMES_IDENTIFIER chordnames_list {
+               $$ = scm_append (scm_list_2 ($1, $2));
+       }
+       | chord_scm '=' full_markup chordnames_list {
+               $$ = scm_cons (scm_cons ($1, $3), $4);
+       };
+
+chord_scm:
+       steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
+               $$ = Chord::tonic_add_sub_to_pitches ($1, $3, $4);
+               /* junk bass and inversion for now */
+       };
+
 translator_spec_block:
        TRANSLATOR '{' translator_spec_body '}'
                {