From: K.Kosako <kkosako0@gmail.com>
Date: Sun, 23 Sep 2018 14:04:38 +0000 (+0900)
Subject: refactoring
X-Git-Tag: v6.9.1~18^2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb5da20ca1d739d725758194332d7505194a5e2d;p=onig

refactoring
---

diff --git a/src/regcomp.c b/src/regcomp.c
index 7fb83be..4d0ffe7 100644
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -5569,7 +5569,7 @@ set_optimize_exact(regex_t* reg, OptExact* e)
     CHECK_NULL_RETURN_MEMERR(reg->exact);
     xmemcpy(reg->exact, e->s, e->len);
     reg->exact_end = reg->exact + e->len;
-    reg->optimize = OPTIMIZE_EXACT_IC;
+    reg->optimize = OPTIMIZE_STR_IC;
   }
   else {
     int allow_reverse;
@@ -5587,11 +5587,11 @@ set_optimize_exact(regex_t* reg, OptExact* e)
       if (r != 0) return r;
 
       reg->optimize = (allow_reverse != 0
-                       ? OPTIMIZE_EXACT_FAST
-                       : OPTIMIZE_EXACT_FAST_STEP_FORWARD);
+                       ? OPTIMIZE_STR_FAST
+                       : OPTIMIZE_STR_FAST_STEP_FORWARD);
     }
     else {
-      reg->optimize = OPTIMIZE_EXACT;
+      reg->optimize = OPTIMIZE_STR;
     }
   }
 
diff --git a/src/regexec.c b/src/regexec.c
index 19fa04d..6120af0 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -4360,15 +4360,15 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 
  retry:
   switch (reg->optimize) {
-  case OPTIMIZE_EXACT:
+  case OPTIMIZE_STR:
     p = slow_search(reg->enc, reg->exact, reg->exact_end, p, end, range);
     break;
-  case OPTIMIZE_EXACT_IC:
+  case OPTIMIZE_STR_IC:
     p = slow_search_ic(reg->enc, reg->case_fold_flag,
                        reg->exact, reg->exact_end, p, end, range);
     break;
 
-  case OPTIMIZE_EXACT_FAST:
+  case OPTIMIZE_STR_FAST:
 #ifdef USE_SUNDAY_QUICK_SEARCH_ALGORITHM
     p = sunday_quick_search(reg, reg->exact, reg->exact_end, p, end, range);
 #else
@@ -4376,7 +4376,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
 #endif
     break;
 
-  case OPTIMIZE_EXACT_FAST_STEP_FORWARD:
+  case OPTIMIZE_STR_FAST_STEP_FORWARD:
 #ifdef USE_SUNDAY_QUICK_SEARCH_ALGORITHM
     p = sunday_quick_search_step_forward(reg, reg->exact, reg->exact_end,
                                          p, end, range);
@@ -4492,20 +4492,20 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
 
  retry:
   switch (reg->optimize) {
-  case OPTIMIZE_EXACT:
+  case OPTIMIZE_STR:
   exact_method:
     p = slow_search_backward(reg->enc, reg->exact, reg->exact_end,
                              range, adjrange, end, p);
     break;
 
-  case OPTIMIZE_EXACT_IC:
+  case OPTIMIZE_STR_IC:
     p = slow_search_backward_ic(reg->enc, reg->case_fold_flag,
                                 reg->exact, reg->exact_end,
                                 range, adjrange, end, p);
     break;
 
-  case OPTIMIZE_EXACT_FAST:
-  case OPTIMIZE_EXACT_FAST_STEP_FORWARD:
+  case OPTIMIZE_STR_FAST:
+  case OPTIMIZE_STR_FAST_STEP_FORWARD:
     goto exact_method;
     break;
 
diff --git a/src/regint.h b/src/regint.h
index ae90786..826e165 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -318,11 +318,11 @@ enum StackPopLevel {
 /* optimize flags */
 enum OptimizeType {
   OPTIMIZE_NONE = 0,
-  OPTIMIZE_EXACT,                    /* Slow Search */
-  OPTIMIZE_EXACT_FAST,               /* Sunday quick search or BMH */
-  OPTIMIZE_EXACT_FAST_STEP_FORWARD,  /* Sunday quick search or BMH */
-  OPTIMIZE_EXACT_IC,                 /* Slow Search (ignore case) */
-  OPTIMIZE_MAP                       /* char map */
+  OPTIMIZE_STR,                    /* Slow Search */
+  OPTIMIZE_STR_FAST,               /* Sunday quick search or BMH */
+  OPTIMIZE_STR_FAST_STEP_FORWARD,  /* Sunday quick search or BMH */
+  OPTIMIZE_STR_IC,                 /* Slow Search (ignore case) */
+  OPTIMIZE_MAP                     /* char map */
 };
 
 /* bit status */