define SET_ENCLOSE_RECURSION()

diff --git a/src/regcomp.c b/src/regcomp.c
index 45fd0dfc4079590d8c87f994f7b580801c744093..27d4161a683a2e7d44af8c2387862cd4a9fa14c7 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -2929,7 +2929,8 @@ subexp_recursive_check_trav(Node* node, ScanEnv* env)
         if (IS_ENCLOSE_CALLED(en)) {
           SET_ENCLOSE_STATUS(node, NST_MARK1);
           r = subexp_recursive_check(en->target);
-          if (r != 0) SET_ENCLOSE_STATUS(node, NST_RECURSION);
+          if (r != 0)
+            SET_ENCLOSE_RECURSION(node);
           CLEAR_ENCLOSE_STATUS(node, NST_MARK1);
         }
       }

diff --git a/src/regparse.h b/src/regparse.h
index c9d1fe8a6ec4f496d0f8131ad49800f592db952f..2c7f72c08abe58cecd2de5841aebff8c81c672be 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -4,7 +4,7 @@
   regparse.h -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -134,6 +134,7 @@
 
 #define SET_ENCLOSE_STATUS(node,f)      (node)->u.enclose.state |=  (f)
 #define CLEAR_ENCLOSE_STATUS(node,f)    (node)->u.enclose.state &= ~(f)
+#define SET_ENCLOSE_RECURSION(node)     (node)->u.enclose.state |= NST_RECURSION
 
 #define IS_ENCLOSE_CALLED(en)          (((en)->state & NST_CALLED)        != 0)
 #define IS_ENCLOSE_ADDR_FIXED(en)      (((en)->state & NST_ADDR_FIXED)    != 0)