# HG changeset patch # User Masataka Kohagura # Date 1451127818 -32400 # Node ID e809a2dd0731bbdeebad1ee45be7854516416d07 # Parent 39ca25ed06078f8960c1316810231f1a125411a9 add scValue diff -r 39ca25ed0607 -r e809a2dd0731 regexParser/TODO --- 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 のテストルーチンを作成する diff -r 39ca25ed0607 -r e809a2dd0731 regexParser/regexParser.h --- 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; diff -r 39ca25ed0607 -r e809a2dd0731 regexParser/subsetConstraction.cc --- 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) {