Mercurial > hg > Members > masakoha > testcode

changeset 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 d7f762404113
files c/regexParser/subsetConstraction.cc
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/c/regexParser/subsetConstraction.cc	Fri Dec 18 17:59:16 2015 +0900
+++ b/c/regexParser/subsetConstraction.cc	Fri Dec 18 19:10:33 2015 +0900
@@ -105,8 +105,13 @@
         if (end > cc->cond.range.end) {
             if (begin == cc->cond.range.begin) {    // 8
                 CharClassPtr cc1;
+<<<<<<< local
+                if (cc->right) {
+                    cc1 = charClassMerge(cc->right,begin,end-1,nextState);
+=======
                 if (cc->right) {
                     cc1 = charClassMerge(cc->right,begin,cc->cond.range.end,nextState);
+>>>>>>> other
                 } else {
                     cc1 = createCharClassRange(begin,cc->cond.range.end,NULL,NULL);
                     cc1->nextState = nextState;