# HG changeset patch # User mir3636 # Date 1462617708 -32400 # Node ID c4d33b7c3ccd44a2b76654c9ab34e1a29417aa96 # Parent 66012db6a717c67666e390c6cfcf6905bfc18bdd no compile error diff -r 66012db6a717 -r c4d33b7c3ccd regexParser/Makefile --- a/regexParser/Makefile Sat May 07 19:18:43 2016 +0900 +++ b/regexParser/Makefile Sat May 07 19:41:48 2016 +0900 @@ -66,7 +66,7 @@ ./cerium/ceriumGrep $(SUBSET) -regex $(REGEX) -file $(TESTFILE) $(WC) test2: regexParser $(TESTFILE) - ./regexParser $(SUBSET) -regex $(REGEX)-file $(TESTFILE) $(WC) + ./regexParser $(SUBSET) -regex $(REGEX) -file $(TESTFILE) $(WC) grepWalk: regexParser $(TESTFILE) ./regexParser $(SUBSET) -regex $(REGEX) -file $(TESTFILE) $(WC) diff -r 66012db6a717 -r c4d33b7c3ccd regexParser/grepWalk.cc --- a/regexParser/grepWalk.cc Sat May 07 19:18:43 2016 +0900 +++ b/regexParser/grepWalk.cc Sat May 07 19:41:48 2016 +0900 @@ -1,5 +1,6 @@ #include #include +#include #include "grepWalk.h" #include "subsetConstruction.h" @@ -50,13 +51,13 @@ // range matched. if (cc->cond.w.word) { WordPtr w; - for (w = &cc->cond.w.word;w;w = w->next) { + for (w = &cc->cond.w;w;w = w->next) { // match the word. // if (not match) continue; - if (strncmp(w.word,tsv.buff.buffptr-1,w.length)) break; + if (strncmp((const char *)w->word,(const char *)tsv.buff.buffptr-1,w->length)) break; } if (!w) continue; - tsv.buff.buffptr += w.length - 1; + tsv.buff.buffptr += w->length - 1; } state = nextState(cc->nextState,tg); goto next;