Mercurial > hg > Applications > Grep
diff regexParser/generateSequentialSearch.cc @ 324:879dc5d1cb6a default tip
fix
author | mir3636 |
---|---|
date | Fri, 27 May 2016 21:21:09 +0900 |
parents | c9ac6f06e706 |
children |
line wrap: on
line diff
--- a/regexParser/generateSequentialSearch.cc Thu May 26 20:03:07 2016 +0900 +++ b/regexParser/generateSequentialSearch.cc Fri May 27 21:21:09 2016 +0900 @@ -4,6 +4,18 @@ #include "generateSequentialSearch.h" #include "CharClass.h" #include "subsetConstruction.h" +#include "bmSearch.h" + +static void +wordMatch(const char* cond,FILE* fp,unsigned long begin,CharClassPtr cc,BitVector bi) { + fprintf(fp," else if (c%s'%c') { \n",cond,(unsigned char)begin); + WordPtr w; + for (w = &cc->cond.w;w;w = w->next) { + // match the word. + fprintf(fp," if (strncmp(\"%s\",(const char *)tsv.buff.buffptr-1,%d)==0) { tsv.buff.buffptr += %d;return state%lx(tsv);}\n",(const char *)w->word,w->length,w->length - 1,bi.bitContainer); + } + fprintf(fp," tsv=tsv.tg->stateSkip(tsv);return state0(tsv);;\n } \n"); +} static void generateState1(StatePtr state,long stateNum, bool accept, FILE *fp, TransitionGeneratorPtr tg) { @@ -21,10 +33,18 @@ unsigned long end = cc->cond.range.end; BitVector bi = cc->nextState; if (begin == end) { - fprintf(fp," else if (c=='%c') { return state%lx(tsv);}\n",(unsigned char)begin, bi.bitContainer); + if (cc->cond.w.word) { + wordMatch("==",fp,begin,cc,bi); + } else { + fprintf(fp," else if (c=='%c') { return state%lx(tsv);}\n",(unsigned char)begin, bi.bitContainer); + } } else { fprintf(fp," else if (c<'%c') { tsv=tsv.tg->stateSkip(tsv);return state0(tsv);}\n",(unsigned char)begin); - fprintf(fp," else if (c<='%c') { return state%lx(tsv);} \n",(unsigned char)end, bi.bitContainer); + if (cc->cond.w.word) { + wordMatch("<=",fp,begin,cc,bi); + } else { + fprintf(fp," else if (c<='%c') { return state%lx(tsv);} \n",(unsigned char)end, bi.bitContainer); + } } } free(ccw); @@ -52,6 +72,8 @@ if (state->bitState.bitContainer!=1) // state1 always unused but state0 generateState1(state,state->bitState.bitContainer,true,fp,tg); } + checkBMSearch(tg->stateStart->cc); + tsv.current = generateTState(tg->stateStart,tg); fclose(fp); }