Mercurial > hg > Members > masakoha > testcode

changeset 203:e809a2dd0731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add scValue
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Sat, 26 Dec 2015 20:03:38 +0900
parents 39ca25ed0607
children e6e862e92fdc
files regexParser/TODO regexParser/regexParser.h regexParser/subsetConstraction.cc
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/regexParser/TODO	Sat Dec 26 19:49:34 2015 +0900
+++ b/regexParser/TODO	Sat Dec 26 20:03:38 2015 +0900
@@ -2,3 +2,4 @@
     TODO CharClassWalker のテストルーチンを作成する
     TODO CharClassMerge のテストルーチンを作成する
     TODO serchBit のテストルーチンを作成する
+    TODO subsetConstraction のテストルーチンを作成する
--- a/regexParser/regexParser.h	Sat Dec 26 19:49:34 2015 +0900
+++ b/regexParser/regexParser.h	Sat Dec 26 20:03:38 2015 +0900
@@ -59,12 +59,19 @@
 } StateStack, *StateStackPtr;
 
 typedef struct transitionGenerator {
-    long stateMax;
+    long totalStateCount;
     StateStackPtr stack;
     StatePtr *stateArray;
     StatePtr stateList;
 } TransitionGenerator, *TransitionGeneratorPtr;
 
+typedef struct scValue {
+    StatePtr stateTop;
+    StatePtr stateEnd;
+    StatePtr *stateArray;
+    TransitionGeneratorPtr tg;
+} SCValue, *SCValuePtr;
+
 typedef struct tgValue {
     bool asterisk;
     StatePtr startState;
--- a/regexParser/subsetConstraction.cc	Sat Dec 26 19:49:34 2015 +0900
+++ b/regexParser/subsetConstraction.cc	Sat Dec 26 20:03:38 2015 +0900
@@ -357,7 +357,7 @@
     while (scv.stateEnd->next) {
         scv.stateEnd = scv.stateEnd->next;
     }
-    return;
+    return scv;
 }
 
 SCValue createState(SCValue scv,BitVector bi) {