Mercurial > hg > Applications > Grep
diff regexParser/regexParser.h @ 188:109d22faf7b5 pairPro
remove errors and warnings
| author | Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Fri, 25 Dec 2015 02:57:21 +0900 |
| parents | ef798db705e9 |
| children | 3e8e5780ad4a |
line wrap: on
line diff
--- a/regexParser/regexParser.h Thu Dec 24 22:38:50 2015 +0900 +++ b/regexParser/regexParser.h Fri Dec 25 02:57:21 2015 +0900 @@ -1,8 +1,9 @@ #include "error.h" - #define NEW(type) (type*)malloc(sizeof(type)) #define SYNTAX_NODENUMBER 100 +#ifndef INCLUDED_STRUCT +#define INCLUDED_STRUCT typedef struct bitVector { unsigned long bitContainer; }BitVector,*BitVectorPtr; @@ -58,6 +59,8 @@ node::StatePtr state; node::StatePtr stateArray; node::StatePtr currentState; + node::StatePtr startState; + node::StatePtr endState; } TransitionGenerator, *TransitionGeneratorPtr; typedef struct tgValue { @@ -93,6 +96,6 @@ unsigned char *tokenValue; int stateNumber; } RegexInfo, *RegexInfoPtr; - +#endif NodePtr createNode(RegexInfoPtr ri,unsigned char type,CharClassPtr cc, NodePtr left, NodePtr right); -CharClassPtr createCharClassRange(unsigned long begin, unsigned long end, CharClassPtr left, CharClassPtr right); +extern CharClassPtr createCharClassRange(unsigned long begin, unsigned long end,unsigned long state, CharClassPtr left, CharClassPtr right);