# HG changeset patch
# User masa
# Date 1450433433 -32400
# Node ID dcd751ba71037c15efdf7c833e9f40aa34bec274
# Parent  b5ecfc008bcf33939cf137ecfae92f089a1d66a1
merge

diff -r b5ecfc008bcf -r dcd751ba7103 c/regexParser/subsetConstraction.cc
--- 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;