Mercurial > hg > Members > masakoha > testcode
changeset 267:5d4afe6f6d00
fix(not working)
author | Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 29 Jan 2016 13:31:01 +0900 |
parents | e51cac73e42a |
children | 0e423d9f9647 |
files | regexParser/CeriumGrep.cc regexParser/regexParser.h regexParser/subsetConstruction.cc |
diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/regexParser/CeriumGrep.cc Thu Jan 28 21:14:34 2016 +0900 +++ b/regexParser/CeriumGrep.cc Fri Jan 29 13:31:01 2016 +0900 @@ -9,6 +9,10 @@ #include "fileread.h" #include "threadedSearch.h" +void createAllPossibleState(TransitionGeneratorPtr tg) { + return; +} + Search grep(int argc,char **argv,bool parallel) { bool generate = true;
--- a/regexParser/regexParser.h Thu Jan 28 21:14:34 2016 +0900 +++ b/regexParser/regexParser.h Fri Jan 29 13:31:01 2016 +0900 @@ -95,9 +95,9 @@ StatePtr *stateArray; StatePtr stateList; StatePtr anyState; - TSValue stateSkip(TSValue tsv); - TSValue stateMatch(TSValue tsv); - TSValue stateNothing(TSValue tsv); + tsValue stateSkip(tsValue tsv); + tsValue stateMatch(tsValue tsv); + tsValue stateNothing(tsValue tsv); } TransitionGenerator, *TransitionGeneratorPtr; typedef struct buffer { @@ -152,7 +152,7 @@ typedef struct { unsigned char* file_mmap; - off_t size; + unsigned long size; } st_mmap_t; typedef struct search {
--- a/regexParser/subsetConstruction.cc Thu Jan 28 21:14:34 2016 +0900 +++ b/regexParser/subsetConstruction.cc Fri Jan 29 13:31:01 2016 +0900 @@ -357,7 +357,7 @@ tgv.tg->stateArray[endState->bitState.bitContainer] = endState; BitVector anyBi; anyBi.bitContainer = bi.bitContainer * 2 - 1; // all bit 1 state - tgv.tg->anyState = createState(tgv,anyBi); + tgv.tg->anyState = createState(tgv.tg,anyBi); tgv.startState = startState; tgv.endState = endState; tgv = generateTransition(n,tgv,2);