From: K.Kosako <kosako@sofnec.co.jp>
Date: Mon, 5 Feb 2018 05:54:13 +0000 (+0900)
Subject: refactoring
X-Git-Tag: v6.8.0~386
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6ea92a2f569098b6205ea14a161bcf2e296fb44;p=onig

refactoring
---

diff --git a/src/regexec.c b/src/regexec.c
index e54edd9..5696ce5 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -839,7 +839,7 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
 #define STK_EMPTY_CHECK_START      0x3000
 #define STK_EMPTY_CHECK_END        0x5000  /* for recursive call */
 #define STK_MEM_END_MARK           0x8500
-#define STK_TO_VOID_START          0x0600  /* mark for "(?>...)" */
+#define STK_TO_VOID_START          0x1600  /* mark for "(?>...)" */
 #define STK_REPEAT                 0x0700
 #define STK_CALL_FRAME             0x0800
 #define STK_RETURN                 0x0900
@@ -1507,12 +1507,12 @@ stack_double(int is_alloca, char** arg_alloc_base,
     k--;\
     STACK_BASE_CHECK(k, "STACK_EXEC_TO_VOID"); \
     if (IS_TO_VOID_TARGET(k)) {\
+      if (k->type == STK_TO_VOID_START) {\
+        k->type = STK_VOID;\
+        break;\
+      }\
       k->type = STK_VOID;\
     }\
-    else if (k->type == STK_TO_VOID_START) {\
-      k->type = STK_VOID;\
-      break;\
-    }\
   }\
 } while(0)