Mercurial > hg > Applications > Grep
diff regexParser/CharClass.cc @ 309:058c87665213
small fix
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Mon, 08 Feb 2016 18:04:28 +0900 |
parents | 1188debbef10 |
children | df27e6cab846 |
line wrap: on
line diff
--- a/regexParser/CharClass.cc Mon Feb 08 12:45:45 2016 +0900 +++ b/regexParser/CharClass.cc Mon Feb 08 18:04:28 2016 +0900 @@ -10,10 +10,20 @@ #include "CharClass.h" +CharClassPtr createCharClassRange(unsigned long begin, unsigned long end,unsigned long state, CharClassPtr left, CharClassPtr right) { + CharClassPtr cc = NEW(CharClass); + cc->cond.range.begin = begin; + cc->cond.range.end = end; + cc->cond.w.word = NULL; + cc->cond.w.length = 0; + cc->left = left; + cc->right = right; + cc->nextState.bitContainer = state; + return cc; +} CharClassPtr createCharClassWord(RegexInfoPtr ri) { CharClassPtr cc = NEW(CharClass); - cc->type = 'a'; cc->left = NULL; cc->right = NULL; cc->cond.w.word = ri->tokenValue; @@ -96,18 +106,6 @@ } -CharClassPtr createCharClassRange(unsigned long begin, unsigned long end,unsigned long state, CharClassPtr left, CharClassPtr right) { - CharClassPtr cc = NEW(CharClass); - cc->type = 'r'; - cc->cond.range.begin = begin; - cc->cond.range.end = end; - cc->cond.w.word = NULL; - cc->cond.w.length = 0; - cc->left = left; - cc->right = right; - cc->nextState.bitContainer = state; - return cc; -} CharClassPtr charClassMerge(CharClassPtr cc,unsigned long begin, unsigned long end, BitVector nextState) ;