diff regexParser/subsetConstraction.h @ 180:d97bcab546e8 pairPro

implement getNext
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Thu, 24 Dec 2015 17:56:28 +0900
parents 3be0fbcd4b52
children 3c4db09b8581
line wrap: on
line diff
--- a/regexParser/subsetConstraction.h	Wed Dec 23 19:44:48 2015 +0900
+++ b/regexParser/subsetConstraction.h	Thu Dec 24 17:56:28 2015 +0900
@@ -7,11 +7,9 @@
 } StateStack, *StateStackPtr;
 
 typedef struct transitionGenerator {
-    TransitionPtr ts;
     long stateMax;
     StateStack stack;
     StatePtr state;
-    TransitionPtr transitionList;
     StatePtr stateArray;
     StatePtr stateArrayLast;
     StatePtr currentState;
@@ -19,19 +17,24 @@
 } TransitionGenerator, *TransitionGeneratorPtr;
 
 typedef struct tgValue {
-    TransitionPtr ts;
     bool asterisk;
     TransitionGeneratorPtr tg;
 } TGValue, *TGValuePtr;
 
+enum charClassStackState {
+    LEFT,
+    SELF,
+    RIGHT
+}
+
 typedef struct charClassStack {
-    bool left;
+    charClassStackState turn;
     CharClassPtr cc;
     struct charClassStack *next;
 } CharClassStack, *CharClassStackPtr;
 
 typedef struct charClassWalker {
-    CharClassStack stack;
+    CharClassStackPtr stack;
     CharClassPtr next;
 } CharClassWalker, *CharClassWalkerPtr;