From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Sun, 5 Apr 2015 14:39:29 +0000 (+0100)
Subject: Removed useless type of DFA state.
X-Git-Tag: 0.15~317
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30806635b56cb48000d913a14ade372ba253e00c;p=re2c

Removed useless type of DFA state.

'Enter' was encapsulated by 'Initial' and never used on its own.
---

diff --git a/re2c/code.cc b/re2c/code.cc
index 7e5e739b..a52730ee 100644
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -332,31 +332,6 @@ void Match::emit(Output & output, uint ind, bool &readCh, const std::string&) co
 	}
 }
 
-void Enter::emit(Output & output, uint ind, bool &readCh, const std::string&) const
-{
-	OutputFile & o = output.source;
-
-	if (state->link)
-	{
-		o << input_api.stmt_skip (ind);
-		if (vUsedLabels.count(label))
-		{
-			o << labelPrefix << label << ":\n";
-		}
-		need(o, ind, state->depth, readCh, false);
-	}
-	else
-	{
-		/* we shouldn't need 'rule-following' protection here */
-		o << input_api.stmt_skip_peek (ind);
-		if (vUsedLabels.count(label))
-		{
-			o << labelPrefix << label << ":\n";
-		}
-		readCh = false;
-	}
-}
-
 void Initial::emit(Output & output, uint ind, bool &readCh, const std::string&) const
 {
 	OutputFile & o = output.source;
@@ -1137,7 +1112,6 @@ static void generate_data (State * s, bool def, const std::vector<std::vector<ui
 			}
 			break;
 		case Action::MATCH:
-		case Action::ENTER:
 		case Action::INITIAL:
 		case Action::SAVE:
 		case Action::MOVE:
diff --git a/re2c/dfa.h b/re2c/dfa.h
index 8cc3eb13..c5501029 100644
--- a/re2c/dfa.h
+++ b/re2c/dfa.h
@@ -24,7 +24,6 @@ public:
 	{
 		NONE,
 		MATCH,
-		ENTER,
 		INITIAL,
 		SAVE,
 		MOVE,
@@ -62,19 +61,10 @@ public:
 	void emit(Output &, uint, bool&, const std::string&) const;
 };
 
-class Enter: public Action
+class Initial: public Action
 {
 public:
 	uint	label;
-
-public:
-	Enter(State*, uint);
-	void emit(Output &, uint, bool&, const std::string&) const;
-};
-
-class Initial: public Enter
-{
-public:
 	bool setMarker;
 
 public:
@@ -282,12 +272,7 @@ inline Match::Match(State *s) : Action(s)
 	type = MATCH;
 }
 
-inline Enter::Enter(State *s, uint l) : Action(s), label(l)
-{
-	type = ENTER;
-}
-
-inline Initial::Initial(State *s, uint l, bool b) : Enter(s, l), setMarker(b)
+inline Initial::Initial(State *s, uint l, bool b) : Action(s), label(l), setMarker(b)
 {
 	type = INITIAL;
 }