refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index bf04c4da13ca23ed1706e0d87f90710bde7345b6..b83df97992506b716caac210939d0d38f23c4349 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -4258,9 +4258,9 @@ setup_anchor(Node* node, regex_t* reg, int state, ScanEnv* env)
 {
 /* allowed node types in look-behind */
 #define ALLOWED_TYPE_IN_LB \
-  ( BIT_NODE_LIST | BIT_NODE_ALT | BIT_NODE_STRING | BIT_NODE_CCLASS \
-  | BIT_NODE_CTYPE | BIT_NODE_ANCHOR | BIT_NODE_ENCLOSURE | BIT_NODE_QUANT \
-  | BIT_NODE_CALL | BIT_NODE_GIMMICK)
+  ( NODE_BIT_LIST | NODE_BIT_ALT | NODE_BIT_STRING | NODE_BIT_CCLASS \
+  | NODE_BIT_CTYPE | NODE_BIT_ANCHOR | NODE_BIT_ENCLOSURE | NODE_BIT_QUANT \
+  | NODE_BIT_CALL | NODE_BIT_GIMMICK)
 
 #define ALLOWED_ENCLOSURE_IN_LB       ( 1<<ENCLOSURE_MEMORY | 1<<ENCLOSURE_OPTION )
 #define ALLOWED_ENCLOSURE_IN_LB_NOT   (1<<ENCLOSURE_OPTION)

diff --git a/src/regparse.h b/src/regparse.h
index 3ffbea4a80ba469c4f395404183c65e3e826c426..2144feca8c27dfda01fbfde03d3abf4defe27838 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -60,21 +60,21 @@ enum GimmickType {
 /* node type bit */
 #define NODE_TYPE2BIT(type)      (1<<(type))
 
-#define BIT_NODE_STRING     NODE_TYPE2BIT(NODE_STRING)
-#define BIT_NODE_CCLASS     NODE_TYPE2BIT(NODE_CCLASS)
-#define BIT_NODE_CTYPE      NODE_TYPE2BIT(NODE_CTYPE)
-#define BIT_NODE_BACKREF    NODE_TYPE2BIT(NODE_BACKREF)
-#define BIT_NODE_QUANT      NODE_TYPE2BIT(NODE_QUANT)
-#define BIT_NODE_ENCLOSURE  NODE_TYPE2BIT(NODE_ENCLOSURE)
-#define BIT_NODE_ANCHOR     NODE_TYPE2BIT(NODE_ANCHOR)
-#define BIT_NODE_LIST       NODE_TYPE2BIT(NODE_LIST)
-#define BIT_NODE_ALT        NODE_TYPE2BIT(NODE_ALT)
-#define BIT_NODE_CALL       NODE_TYPE2BIT(NODE_CALL)
-#define BIT_NODE_GIMMICK    NODE_TYPE2BIT(NODE_GIMMICK)
+#define NODE_BIT_STRING     NODE_TYPE2BIT(NODE_STRING)
+#define NODE_BIT_CCLASS     NODE_TYPE2BIT(NODE_CCLASS)
+#define NODE_BIT_CTYPE      NODE_TYPE2BIT(NODE_CTYPE)
+#define NODE_BIT_BACKREF    NODE_TYPE2BIT(NODE_BACKREF)
+#define NODE_BIT_QUANT      NODE_TYPE2BIT(NODE_QUANT)
+#define NODE_BIT_ENCLOSURE  NODE_TYPE2BIT(NODE_ENCLOSURE)
+#define NODE_BIT_ANCHOR     NODE_TYPE2BIT(NODE_ANCHOR)
+#define NODE_BIT_LIST       NODE_TYPE2BIT(NODE_LIST)
+#define NODE_BIT_ALT        NODE_TYPE2BIT(NODE_ALT)
+#define NODE_BIT_CALL       NODE_TYPE2BIT(NODE_CALL)
+#define NODE_BIT_GIMMICK    NODE_TYPE2BIT(NODE_GIMMICK)
 
 #define NODE_IS_SIMPLE_TYPE(node) \
   ((NODE_TYPE2BIT(NODE_TYPE(node)) & \
-    (BIT_NODE_STRING | BIT_NODE_CCLASS | BIT_NODE_CTYPE | BIT_NODE_BACKREF)) != 0)
+    (NODE_BIT_STRING | NODE_BIT_CCLASS | NODE_BIT_CTYPE | NODE_BIT_BACKREF)) != 0)
 
 #define NODE_TYPE(node)             ((node)->u.base.node_type)
 #define NODE_SET_TYPE(node, ntype)   (node)->u.base.node_type = (ntype)