stapregex cleanup: move maxFill inside of class DFA

diff --git a/re2c-migrate/re2c-dfa.cxx b/re2c-migrate/re2c-dfa.cxx
index bdbde23e62421046ce0a401d2b2f19b508e44648..1e174f1bce0a49ebb5917fd0f99718cab019f1f8 100644 (file)
--- a/re2c-migrate/re2c-dfa.cxx
+++ b/re2c-migrate/re2c-dfa.cxx
@@ -303,6 +303,7 @@ DFA::DFA(Ins *ins, unsigned ni, unsigned lb, unsigned ub, const Char *rep)
        , toDo(NULL)
        , free_ins(ins)
        , free_rep(rep)
+        , maxFill(1)
 {
        Ins **work = new Ins * [ni + 1];
        unsigned nc = ub - lb;

diff --git a/re2c-migrate/re2c-dfa.h b/re2c-migrate/re2c-dfa.h
index 6b38c4d40cc862164fd9587574e13b9bdbb5e24e..d80ff513aff48bfc4e5abefdc26f7051f17c7429 100644 (file)
--- a/re2c-migrate/re2c-dfa.h
+++ b/re2c-migrate/re2c-dfa.h
@@ -272,6 +272,7 @@ public:
        State   *toDo;
        const Ins     *free_ins;
        const Char    *free_rep;
+        unsigned maxFill;
 
 protected:
        bool    bSaveOnHead;
@@ -301,6 +302,7 @@ public:
                , head(oth.head)
                , tail(oth.tail)
                , toDo(oth.toDo)
+                , maxFill(oth.maxFill)
        {
        }
        DFA& operator = (const DFA& oth)

diff --git a/re2c-migrate/re2c-emit.cxx b/re2c-migrate/re2c-emit.cxx
index 3d427dfedb08f5556a97989464acd32a274c3659..92d717970b0dae105002a390c784f57ef7eccbeb 100644 (file)
--- a/re2c-migrate/re2c-emit.cxx
+++ b/re2c-migrate/re2c-emit.cxx
@@ -156,7 +156,6 @@ std::string yyFillLength("@@");
 std::string yySetConditionParam("@@");
 std::string yySetStateParam("@@");
 std::string yySetupRule("");
-unsigned maxFill = 1;
 unsigned next_label = 0;
 unsigned cGotoThreshold = 9;