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 7e5e739b05d331d63324d7f5c78af6d0a7437ff7..a52730eecc18bcbccad5eb06d3b3f1a256014ab3 100644 (file)
--- 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 8cc3eb13fac5d8d98f079acdfa02ffe12e284307..c55010293454881933b61311d4ea7656681483cc 100644 (file)
--- 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;
 }