rename NodeBase#type to NodeBase#node_type

diff --git a/src/regint.h b/src/regint.h
index bf424d42ab8d4558a36808c8aecf8fdd9ab70a74..c4cb4f3030e8f348816271f31f00c22dbeebc590 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -652,7 +652,7 @@ typedef void* PointerType;
 struct _Node;
 
 typedef struct {
-  int type;
+  int node_type;
   int status;
   struct _Node* body;
 } NodeBase;

diff --git a/src/regparse.h b/src/regparse.h
index 12b96899c9aa7b3c2ef16a38cd4cfeab6a3db2fe..601cbbf01ce76865bed7448f41126ade5a44ab50 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -63,8 +63,8 @@
   ((NTYPE2BIT(type) & (BIT_NT_STR | BIT_NT_CCLASS | BIT_NT_CTYPE |\
                        BIT_NT_CANY | BIT_NT_BREF)) != 0)
 
-#define NTYPE(node)             ((node)->u.base.type)
-#define SET_NTYPE(node, ntype)   (node)->u.base.type = (ntype)
+#define NTYPE(node)             ((node)->u.base.node_type)
+#define SET_NTYPE(node, ntype)   (node)->u.base.node_type = (ntype)
 
 #define NSTR(node)         (&((node)->u.str))
 #define NCCLASS(node)      (&((node)->u.cclass))