From: David Kastrup <dak@gnu.org>
Date: Fri, 26 Oct 2012 10:54:25 +0000 (+0200)
Subject: lexer.ll: lyric_quote was not necessary as separate state.
X-Git-Tag: release/2.17.6-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=b36e9b7d5725786b282bc0d63d0291a37e388b75;p=lilypond.git

lexer.ll: lyric_quote was not necessary as separate state.
---

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 9f99b463bf..bad1cd7954 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -91,11 +91,6 @@ bool is_valid_version (string s);
                 yylval = SCM_EOL;               \
         } while (0)
 
-#define start_lyric_quote() do {                \
-                yy_push_state (lyric_quote);    \
-                yylval = SCM_EOL;               \
-        } while (0)
-
 #define yylval (*lexval_)
 
 #define yylloc (*lexloc_)
@@ -124,7 +119,6 @@ SCM (* scm_parse_error_handler) (void *);
 %x figures
 %x incl
 %x lyrics
-%x lyric_quote
 %x longcomment
 %x markup
 %x notes
@@ -510,7 +504,7 @@ BOM_UTF8	\357\273\277
 	}
 }
 
-<quote,lyric_quote>{
+<quote>{
 	\\{ESCAPED}	{
                 char c = escaped_char (YYText ()[1]);
 		yylval = scm_cons (scm_from_locale_stringn (&c, 1),
@@ -540,7 +534,7 @@ BOM_UTF8	\357\273\277
 
 <lyrics>{
 	\" {
-		start_lyric_quote ();
+		start_quote ();
 	}
 	{FRACTION}	{
 		yylval =  scan_fraction (YYText ());