define enum EnclosureType

diff --git a/src/regparse.c b/src/regparse.c
index 520137aa6a3a38eededbcaea1bbd714d6cefe8bc..947d7cbe4561e0b5cee1b6d2390ee05e276bc26d 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1470,7 +1470,7 @@ node_new_quantifier(int lower, int upper, int by_number)
 }
 
 static Node*
-node_new_enclosure(int type)
+node_new_enclosure(enum EnclosureType type)
 {
   Node* node = node_new();
   CHECK_NULL_RETURN(node);

diff --git a/src/regparse.h b/src/regparse.h
index d9900145d562643841cb51306c4cbc885ad585f1..57219a4c573435c2515cf7a3f35b3b0351eee8ec 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -100,10 +100,12 @@ enum GimmickType {
 #define ANCHOR_ANYCHAR_STAR_MASK (ANCHOR_ANYCHAR_STAR | ANCHOR_ANYCHAR_STAR_ML)
 #define ANCHOR_END_BUF_MASK      (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF)
 
-#define ENCLOSURE_MEMORY           0
-#define ENCLOSURE_OPTION           1
-#define ENCLOSURE_STOP_BACKTRACK   2
-#define ENCLOSURE_IF_ELSE          3
+enum EnclosureType {
+  ENCLOSURE_MEMORY = 0,
+  ENCLOSURE_OPTION = 1,
+  ENCLOSURE_STOP_BACKTRACK = 2,
+  ENCLOSURE_IF_ELSE = 3,
+};
 
 #define NODE_STRING_MARGIN         16
 #define NODE_STRING_BUF_SIZE       24  /* sizeof(CClassNode) - sizeof(int)*4 */
@@ -233,7 +235,7 @@ typedef struct {
   int status;
   struct _Node* body;
 
-  int type;
+  enum EnclosureType type;
   union {
     struct {
       int regnum;