changeset 173:cca8bb5aeded pairPro

fix
author masa
date Tue, 22 Dec 2015 18:14:17 +0900
parents 540fc12871d9
children b9e913030a47
files regexParser/subsetConstraction.cc regexParser/subsetConstraction.h regexParser/transition.h
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/regexParser/subsetConstraction.cc	Tue Dec 22 15:56:33 2015 +0900
+++ b/regexParser/subsetConstraction.cc	Tue Dec 22 18:14:17 2015 +0900
@@ -219,7 +219,7 @@
 
 TransitionGenerator generateTransitionList(NodePtr n) {
     TransitionGenerator tg;
-    tg.ts = (TransitionPtr)malloc(sizeof(Transition));
+    tg.ts = NEW(Transition);
     generateTransition(n,tg);
     printTransitionList(tg.ts);
     return tg;
--- a/regexParser/subsetConstraction.h	Tue Dec 22 15:56:33 2015 +0900
+++ b/regexParser/subsetConstraction.h	Tue Dec 22 18:14:17 2015 +0900
@@ -7,9 +7,14 @@
 
 typedef struct transitionGenerator {
     TransitionPtr ts;
-    StatePtr state;
     long stateMax;
     StateStack stack;
+    StatePtr state;
+    TransitionPtr transitionList;
+    StatePtr stateArray;
+    StatePtr stateArrayLast;
+    StatePtr currentState;
+    StatePtr nextState;
 } TransitionGenerator, *TransitionGeneratorPtr;
 
 typedef struct tgValue {
--- a/regexParser/transition.h	Tue Dec 22 15:56:33 2015 +0900
+++ b/regexParser/transition.h	Tue Dec 22 18:14:17 2015 +0900
@@ -7,6 +7,7 @@
 
 typedef struct state {
     TransitionPtr transition;
+    NodePtr nextNode;
     struct state *next;
 } State, *StatePtr;