refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index a25c2893b32d39f41c96954bb650e04825593b12..8ce5a964b50d5090e2a470817e59939c2a79d529 100644 (file)
--- 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 2ed2e92634b01592f45eca0ff3e336a4b25ff300..192af20480572a2d08964829a5752326d3f4379f 100644 (file)
--- 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 593edf425727918e614e3f642ff7a0b93c61cd89..bdb5ea50cb0c79f5894ab4406d5de868224b4c50 100644 (file)
--- 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 */
 };