--- a/c/regexParser/regexParser.h	Fri Nov 20 21:02:00 2015 +0900
+++ b/c/regexParser/regexParser.h	Sat Nov 21 18:04:25 2015 +0900
@@ -1,10 +1,15 @@
 typedef struct charClass {
-    unsigned char table[256];
-    struct utf8Range {
-        unsigned char *begin;
-        unsigned char *end;
-        struct utf8Range *next;
-    } *rangeList;
+    unsigned char type;
+    union condition  {
+        struct utf8Range {
+            unsigned char *begin;
+            unsigned char *end;
+            struct utf8Range *next;
+        } rangeList;
+        unsigned char character;
+        WordPtr w;
+    } *conditionList;
+    struct charClass *next;
 } CharClass, *CharClassPtr;
 
 typedef struct word {
@@ -14,12 +19,8 @@
 
 typedef struct node {
     unsigned char tokenType;
-    int nodeNumber;
-    union value {
-        CharClassPtr cc;
-        unsigned char character;
-        WordPtr w;
-    } Value, *ValuePtr;
+    unsigned long nodeNumber;
+    CharClassPtr cc;
     struct node *left;
     struct node *right;
 } Node, *NodePtr;