From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Tue, 3 Jan 2006 11:47:51 +0000 (+0000)
Subject: - Move CharSet ctor/dtor to actions.cc and make clear what the ctor is
X-Git-Tag: 0.13.6~507
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c355ddab4b45d27b86e8d5268d186f5ddc877092;p=re2c

- Move CharSet ctor/dtor to actions.cc and make clear what the ctor is
---

diff --git a/actions.cc b/actions.cc
index 9b15cd9b..be554245 100644
--- a/actions.cc
+++ b/actions.cc
@@ -956,37 +956,52 @@ void genCode(std::ostream& o, RegExp *re)
 	genCode(o, 0, re);
 }
 
-void genCode(std::ostream& o, uint ind, RegExp *re)
+CharSet::CharSet()
+	: fix(0)
+	, freeHead(0)
+	, freeTail(0)
+	, rep(new CharPtr[nRealChars])
+	, ptn(new CharPtn[nRealChars])
 {
-	CharSet *cs = new CharSet();
-	uint j;
-
-	for (j = 0; j < nRealChars; ++j)
+	for (uint j = 0; j < nRealChars; ++j)
 	{
-		cs->rep[j] = &cs->ptn[0];
-		cs->ptn[j].nxt = &cs->ptn[j + 1];
+		rep[j] = &ptn[0];
+		ptn[j].nxt = &ptn[j + 1];
 	}
 
-	cs->freeHead = &cs->ptn[1];
-	*(cs->freeTail = &cs->ptn[nRealChars - 1].nxt) = NULL;
-	cs->ptn[0].card = nRealChars;
-	cs->ptn[0].nxt = NULL;
-	re->split(*cs);
+	freeHead = &ptn[1];
+	*(freeTail = &ptn[nRealChars - 1].nxt) = NULL;
+	ptn[0].card = nRealChars;
+	ptn[0].nxt = NULL;
+}
+	
+CharSet::~CharSet()
+{
+	delete[] rep;
+	delete[] ptn;
+}
+
+void genCode(std::ostream& o, uint ind, RegExp *re)
+{
+	CharSet cs;
+	uint j;
+
+	re->split(cs);
 	/*
 	    for(uint k = 0; k < nChars;){
-		for(j = k; ++k < nRealChars && cs->rep[k] == cs->rep[j];);
+		for(j = k; ++k < nRealChars && cs.rep[k] == cs.rep[j];);
 		printSpan(cerr, j, k);
-		cerr << "\t" << cs->rep[j] - &cs->ptn[0] << endl;
+		cerr << "\t" << cs.rep[j] - &cs.ptn[0] << endl;
 	    }
 	*/
 	Char *rep = new Char[nRealChars];
 
 	for (j = 0; j < nRealChars; ++j)
 	{
-		if (!cs->rep[j]->nxt)
-			cs->rep[j]->nxt = &cs->ptn[j];
+		if (!cs.rep[j]->nxt)
+			cs.rep[j]->nxt = &cs.ptn[j];
 
-		rep[j] = (Char) (cs->rep[j]->nxt - &cs->ptn[0]);
+		rep[j] = (Char) (cs.rep[j]->nxt - &cs.ptn[0]);
 	}
 
 	re->calcSize(rep);
@@ -1018,7 +1033,6 @@ void genCode(std::ostream& o, uint ind, RegExp *re)
 	delete dfa;
 	delete [] ins;
 	delete [] rep;
-	delete cs;
 }
 
 } // end namespace re2c
diff --git a/re.h b/re.h
index b817a086..4742e757 100644
--- a/re.h
+++ b/re.h
@@ -30,20 +30,8 @@ typedef CharPtn *CharPtr;
 
 struct CharSet
 {
-	CharSet()
-		: fix(0)
-		, freeHead(0)
-		, freeTail(0)
-		, rep(new CharPtr[nRealChars])
-		, ptn(new CharPtn[nRealChars])
-	{
-	}
-	
-	~CharSet()
-	{
-		delete[] rep;
-		delete[] ptn;
-	}
+	CharSet();
+	~CharSet();
 
 	CharPtn	*fix;
 	CharPtn	*freeHead, **freeTail;