From 5a88dafe063be359933edd9a69c18907f5314a8d Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 14 Aug 2013 21:36:58 +0200 Subject: [PATCH] Issue 3498: fatal error with toplevel-markup-identifier The reported problem mrkp = \markup { "x" } \mrkp triggers an error because of markup requiring additional lookahead in assignments. This is fixed by sacrificing string addition, an arcane and undocumented feature that has probably not been used in the last decade or so. --- lily/parser.yy | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lily/parser.yy b/lily/parser.yy index 89123a5e5b..53bddf5eaf 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -2280,17 +2280,6 @@ string: $$ = $1; } | full_markup - | string '+' string { - if (!scm_is_string ($1)) { - parser->parser_error (@1, (_ ("simple string expected"))); - $1 = scm_string (SCM_EOL); - } - if (!scm_is_string ($3)) { - parser->parser_error (@3, (_ ("simple string expected"))); - $3 = scm_string (SCM_EOL); - } - $$ = scm_string_append (scm_list_2 ($1, $3)); - } ; simple_string: STRING { -- 2.39.5