From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Sun, 15 Mar 2015 15:09:46 +0000 (+0000)
Subject: Extracted duplicated code to a function.
X-Git-Tag: 0.15~342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c7d6b06f4d9469fe43c0af12aba3544f429b353;p=re2c

Extracted duplicated code to a function.
---

diff --git a/re2c/code.cc b/re2c/code.cc
index 2faa70f9..986cead5 100644
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -758,6 +758,19 @@ static void genSwitchD (OutputFile & o, const State *from, Span * sp, uint nsp)
 	}
 }
 
+static std::string output_yych (bool & readCh)
+{
+	if (readCh)
+	{
+		readCh = false;
+		return "(" + input_api.expr_peek_save () + ")";
+	}
+	else
+	{
+		return mapCodeName["yych"];
+	}
+}
+
 static void genSwitch(OutputFile & o, uint ind, const State *from, const State *next, bool &readCh, Span * sp, uint nsp)
 {
 	if (nsp <= 2)
@@ -766,15 +779,7 @@ static void genSwitch(OutputFile & o, uint ind, const State *from, const State *
 	}
 	else
 	{
-		if (readCh)
-		{
-			o << indent(ind) << "switch ((" << input_api.expr_peek_save () << ")) {\n";
-			readCh = false;
-		}
-		else
-		{
-			o << indent(ind) << "switch (" << mapCodeName["yych"] << ") {\n";
-		}
+		o << indent(ind) << "switch (" << output_yych (readCh) << ") {\n";
 
 		Cases cases (sp, nsp);
 		for (uint i = 0; i < cases.size (); ++i)
@@ -833,10 +838,7 @@ static void genBase(OutputFile & o, uint ind, const State *from, const State *ne
 
 static std::string genGotoProlog (OutputFile & o, uint ind, const State *from, const State *next, bool &readCh, Span * sp, uint nsp)
 {
-	std::string sYych = readCh
-		? "(" + input_api.expr_peek_save () + ")"
-		: mapCodeName["yych"];
-	readCh = false;
+	std::string sYych = output_yych (readCh);
 
 	if (nsp > 0)
 	{