diff c/regexParser/regexParser.h @ 116:66c633575b53 pairPro

remove error and warning
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Tue, 24 Nov 2015 17:07:08 +0900
parents ca30f8334741
children 31b0ba0050fa
line wrap: on
line diff
--- a/c/regexParser/regexParser.h	Tue Nov 24 14:38:26 2015 +0900
+++ b/c/regexParser/regexParser.h	Tue Nov 24 17:07:08 2015 +0900
@@ -3,17 +3,19 @@
     long length;
 } Word, *WordPtr;
 
+typedef union condition {
+    struct utf8Range {
+        unsigned char *begin;
+        unsigned char *end;
+        struct utf8Range *next;
+    } rangeList;
+    unsigned char character;
+    WordPtr w;
+} Condition, *ConditionList;
+
 typedef struct charClass {
     unsigned char type;
-    union condition  {
-        struct utf8Range {
-            unsigned char *begin;
-            unsigned char *end;
-            struct utf8Range *next;
-        } rangeList;
-        unsigned char character;
-        WordPtr w;
-    } *conditionList;
+    ConditionList cond;
     struct charClass *left;
     struct charClass *right;
     unsigned long *begin;
@@ -27,3 +29,10 @@
     struct node *left;
     struct node *right;
 } Node, *NodePtr;
+
+typedef struct regexInfo {
+    unsigned char *ptr;
+    unsigned char tokenType;
+    int tokenValue;
+    int nodeNumber;
+} RegexInfo, *RegexInfoPtr;