]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 5167/4: Parser: let `assignment_id' return a symbol
authorDavid Kastrup <dak@gnu.org>
Fri, 28 Jul 2017 15:36:18 +0000 (17:36 +0200)
committerDavid Kastrup <dak@gnu.org>
Mon, 7 Aug 2017 21:25:26 +0000 (23:25 +0200)
That's actually what's needed rather than a string.

lily/parser.yy

index f81dc69e9b56faa2e82b4052f86448b492c1a347..d9812b1b9f1c983853e56c655201b2b40d2e16d3 100644 (file)
@@ -672,7 +672,13 @@ header_block:
 */
 assignment_id:
        STRING
+       {
+               $$ = scm_string_to_symbol ($1);
+       }
        | SYMBOL
+       {
+               $$ = scm_string_to_symbol ($1);
+       }
        ;
 
 assignment:
@@ -681,12 +687,12 @@ assignment:
                 $$ = SCM_UNSPECIFIED;
        }
        | assignment_id '.' property_path '=' identifier_init {
-               SCM path = scm_cons (scm_string_to_symbol ($1), $3);
+               SCM path = scm_cons ($1, $3);
                parser->lexer_->set_identifier (path, $5);
                 $$ = SCM_UNSPECIFIED;
        }
        | assignment_id ',' property_path '=' identifier_init {
-               SCM path = scm_cons (scm_string_to_symbol ($1), $3);
+               SCM path = scm_cons ($1, $3);
                parser->lexer_->set_identifier (path, $5);
                 $$ = SCM_UNSPECIFIED;
        }