Mercurial > hg > Applications > Grep
diff regexParser/main.cc @ 178:5e8c6857934c pairPro
implement charClassMerge
author | Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Wed, 23 Dec 2015 19:17:36 +0900 |
parents | 3bf2c6d6d53e |
children | d97bcab546e8 |
line wrap: on
line diff
--- a/regexParser/main.cc Wed Dec 23 17:28:59 2015 +0900 +++ b/regexParser/main.cc Wed Dec 23 19:17:36 2015 +0900 @@ -8,17 +8,23 @@ int main(int argc, char **argv) { - RegexInfoPtr ri = (RegexInfoPtr)malloc(sizeof(RegexInfo)); - ri->nodeNumber = 1; - + RegexInfo ri; + ri.stateNumber = 1; + ri.asterisk = false; + ri.current = NEW(State); + ri.current->bitState.bitContainer = 0 + bitSet(ri.current->bitState,ri.stateNumber); + ri.current->next = NULL; + ri.current->cc = NULL; + ri.current->node = NULL; + ri.states = ri.current; for (int i = 1; i < argc; i++) { if (strcmp(argv[i],"-regex") == 0) { - ri->ptr = (unsigned char*)argv[i+1]; i++; + ri.ptr = (unsigned char*)argv[i+1]; i++; } } - - printf("regex : %s\n",ri->ptr); - NodePtr n = regex(ri); + printf("regex : %s\n",ri.ptr); + NodePtr n = regex(&ri); printTree(n); return 0; }