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

refactoring
---

diff --git a/src/regcomp.c b/src/regcomp.c
index a25c289..8ce5a96 100644
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -5648,7 +5648,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_STR_IC;
+    reg->optimize = OPTIMIZE_STR_CASE_FOLD;
   }
   else {
     int allow_reverse;
diff --git a/src/regexec.c b/src/regexec.c
index 2ed2e92..192af20 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -4367,7 +4367,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
   case OPTIMIZE_STR:
     p = slow_search(reg->enc, reg->exact, reg->exact_end, p, end, range);
     break;
-  case OPTIMIZE_STR_IC:
+  case OPTIMIZE_STR_CASE_FOLD:
     p = slow_search_ic(reg->enc, reg->case_fold_flag,
                        reg->exact, reg->exact_end, p, end, range);
     break;
@@ -4502,7 +4502,7 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
                              range, adjrange, end, p);
     break;
 
-  case OPTIMIZE_STR_IC:
+  case OPTIMIZE_STR_CASE_FOLD:
     p = slow_search_backward_ic(reg->enc, reg->case_fold_flag,
                                 reg->exact, reg->exact_end,
                                 range, adjrange, end, p);
diff --git a/src/regint.h b/src/regint.h
index 593edf4..bdb5ea5 100644
--- a/src/regint.h
+++ b/src/regint.h
@@ -316,7 +316,7 @@ enum OptimizeType {
   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_STR_CASE_FOLD,          /* Slow Search (ignore case) */
   OPTIMIZE_MAP                     /* char map */
 };