From: David Kastrup <dak@gnu.org>
Date: Wed, 14 Aug 2013 19:36:58 +0000 (+0200)
Subject: Issue 3498: fatal error with toplevel-markup-identifier
X-Git-Tag: release/2.17.25-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5a88dafe063be359933edd9a69c18907f5314a8d;p=lilypond.git

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.
---

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 {