--- a/c/regexParser/subsetConstraction.cc	Tue Nov 24 14:38:26 2015 +0900
+++ b/c/regexParser/subsetConstraction.cc	Tue Nov 24 17:07:08 2015 +0900
@@ -2,8 +2,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "bitVector.h"
-#include "regexParser.h"
 
+extern BitVectorListPtr initBitVector();
+BitVectorListPtr setNextBitVectorList(unsigned char, BitVectorListPtr, BitVectorListPtr);
 
 void printBitVectorList (BitVectorListPtr bvl) {
     bool isFirstPrint = true;
@@ -30,7 +31,7 @@
 
 BitVectorListPtr descendTreeNode(NodePtr n,BitVectorListPtr bvl, BitVectorListPtr prev, bool &fromOr, bool &fromAsterisk) {
     bool leftIsOr, rightIsOr;
-    if (n->Value.character == '*') {
+    if (n->cc->cond->character == '*') {
         bvl = descendTreeNode(n->left, bvl, prev, leftIsOr, fromAsterisk);
         unsigned char repertChar = 0;
         for (int i = 0; i < 256; i++) {
@@ -41,26 +42,26 @@
         fromAsterisk = true;
 
         return prev;
-    } else if (n->Value.character == '|') {
+    } else if (n->cc->cond->character == '|') {
         bvl = descendTreeNode(n->left, bvl, prev, leftIsOr, fromAsterisk);
-        setNextBitVectorList(n->left->Value.character, prev, bvl);
+        setNextBitVectorList(n->left->cc->cond->character, prev, bvl);
         bvl = descendTreeNode(n->right, bvl, prev, rightIsOr, fromAsterisk);
-        setNextBitVectorList(n->right->Value.character, prev, bvl);
+        setNextBitVectorList(n->right->cc->cond->character, prev, bvl);
         fromOr = true;
         return prev;
-    } else if (n->Value.character == '+') {
+    } else if (n->cc->cond->character == '+') {
         bvl = descendTreeNode(n->left, bvl, prev, leftIsOr, fromAsterisk);
-        setNextBitVectorList(n->left->Value.character, prev, bvl);
+        setNextBitVectorList(n->left->cc->cond->character, prev, bvl);
         prev = bvl;
         bvl = descendTreeNode(n->right, bvl, prev, rightIsOr, fromAsterisk);
 
         if (leftIsOr){
             for (int i = 0; i < 256; i++)
                 if (prev->next[i] != NULL)
-                    setNextBitVectorList(n->right->Value.character, prev->next[i], bvl);
+                    setNextBitVectorList(n->right->cc->cond->character, prev->next[i], bvl);
         }
         else {
-            setNextBitVectorList(n->right->Value.character, prev, bvl);
+            setNextBitVectorList(n->right->cc->cond->character, prev, bvl);
         }
 
         fromOr = false;