From: Serguei Makarov <smakarov@redhat.com>
Date: Mon, 27 May 2013 21:56:33 +0000 (-0400)
Subject: stapregex cleanup: move maxFill inside of class DFA
X-Git-Tag: release-2.3~218
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2a60585d3b26c493ae5ceac4a9c8a560977a40c4;p=systemtap.git

stapregex cleanup: move maxFill inside of class DFA
---

diff --git a/re2c-migrate/re2c-dfa.cxx b/re2c-migrate/re2c-dfa.cxx
index bdbde23e6..1e174f1bc 100644
--- 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 6b38c4d40..d80ff513a 100644
--- 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 3d427dfed..92d717970 100644
--- 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;