refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index f25d1d56aecfcfe357713cacbc5313810a0d588b..f16e9751e89460574254543ed79f94ea46e0dd57 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -5583,7 +5583,8 @@ set_optimize_exact(regex_t* reg, OptExact* e)
       if (r != 0) return r;
 
       reg->optimize = (allow_reverse != 0
-                       ? OPTIMIZE_EXACT_BMH : OPTIMIZE_EXACT_BMH_STEP_FORWARD);
+                       ? OPTIMIZE_EXACT_FAST
+                       : OPTIMIZE_EXACT_FAST_STEP_FORWARD);
     }
     else {
       reg->optimize = OPTIMIZE_EXACT;
@@ -5809,7 +5810,7 @@ static void
 print_optimize_info(FILE* f, regex_t* reg)
 {
   static const char* on[] = { "NONE", "EXACT",
-                              "EXACT_BMH", "EXACT_BMH_STEP_FORWARD",
+                              "EXACT_FAST", "EXACT_FAST_STEP_FORWARD",
                               "EXACT_IC", "MAP" };
 
   fprintf(f, "optimize: %s\n", on[reg->optimize]);

diff --git a/src/regexec.c b/src/regexec.c
index 420e18d61263c929993494b95691d42ade9c3582..03a773aabaeb1e6974f6a1ccb45a50b09c40c882 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -4368,11 +4368,11 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
                        reg->exact, reg->exact_end, p, end, range);
     break;
 
-  case OPTIMIZE_EXACT_BMH:
+  case OPTIMIZE_EXACT_FAST:
     p = bmh_search(reg, reg->exact, reg->exact_end, p, end, range);
     break;
 
-  case OPTIMIZE_EXACT_BMH_STEP_FORWARD:
+  case OPTIMIZE_EXACT_FAST_STEP_FORWARD:
     p = bmh_search_step_forward(reg, reg->exact, reg->exact_end,
                                 p, end, range);
     break;
@@ -4495,8 +4495,8 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
                                 range, adjrange, end, p);
     break;
 
-  case OPTIMIZE_EXACT_BMH:
-  case OPTIMIZE_EXACT_BMH_STEP_FORWARD:
+  case OPTIMIZE_EXACT_FAST:
+  case OPTIMIZE_EXACT_FAST_STEP_FORWARD:
     goto exact_method;
     break;
 

diff --git a/src/regint.h b/src/regint.h
index b8950c08e20d579b77882477ee2d95b9fdef6d87..ae90786cf4b63b15725542cc47376a4e473626a5 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -317,12 +317,12 @@ enum StackPopLevel {
 
 /* optimize flags */
 enum OptimizeType {
-  OPTIMIZE_NONE                   = 0,
-  OPTIMIZE_EXACT                  = 1,  /* Slow Search */
-  OPTIMIZE_EXACT_BMH              = 2,  /* Boyer-Moore-Horspool */
-  OPTIMIZE_EXACT_BMH_STEP_FORWARD = 3,  /* Boyer-Moore-Horspool */
-  OPTIMIZE_EXACT_IC               = 4,  /* Slow Search (ignore case) */
-  OPTIMIZE_MAP                    = 5   /* char map */
+  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 */
 };
 
 /* bit status */