Mercurial > hg > Applications > Grep

comparison c/regexParser/subsetConstraction.cc @ 157:dcd751ba7103 pairPro

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author masa
date Fri, 18 Dec 2015 19:10:33 +0900
parents b5ecfc008bcf
children f0a347cd9c6a
comparison
equal deleted inserted replaced
156:b5ecfc008bcf 157:dcd751ba7103
103 } 103 }
104 if (begin >= cc->cond.range.begin && begin <= cc->cond.range.end) { 104 if (begin >= cc->cond.range.begin && begin <= cc->cond.range.end) {
105 if (end > cc->cond.range.end) { 105 if (end > cc->cond.range.end) {
106 if (begin == cc->cond.range.begin) { // 8 106 if (begin == cc->cond.range.begin) { // 8
107 CharClassPtr cc1; 107 CharClassPtr cc1;
108 <<<<<<< local
109 if (cc->right) {
110 cc1 = charClassMerge(cc->right,begin,end-1,nextState);
111 =======
108 if (cc->right) { 112 if (cc->right) {
109 cc1 = charClassMerge(cc->right,begin,cc->cond.range.end,nextState); 113 cc1 = charClassMerge(cc->right,begin,cc->cond.range.end,nextState);
114 >>>>>>> other
110 } else { 115 } else {
111 cc1 = createCharClassRange(begin,cc->cond.range.end,NULL,NULL); 116 cc1 = createCharClassRange(begin,cc->cond.range.end,NULL,NULL);
112 cc1->nextState = nextState; 117 cc1->nextState = nextState;
113 } 118 }
114 CharClassPtr cc3 = createCharClassRange(cc->cond.range.end+1,end,cc->left,cc1); 119 CharClassPtr cc3 = createCharClassRange(cc->cond.range.end+1,end,cc->left,cc1);