]> granicus.if.org Git - onig/commitdiff
refactoring
authorK.Kosako <kkosako0@gmail.com>
Sat, 22 Sep 2018 13:59:20 +0000 (22:59 +0900)
committerK.Kosako <kkosako0@gmail.com>
Sat, 22 Sep 2018 13:59:20 +0000 (22:59 +0900)
src/regcomp.c

index f16e9751e89460574254543ed79f94ea46e0dd57..7fb83becf835dc8acd518b82bbbbffa262674f31 100644 (file)
@@ -4553,8 +4553,10 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
 }
 
 #ifdef USE_SUNDAY_QUICK_SEARCH_ALGORITHM
+/* set skip map for Sunday quick search */
 static int
-set_bmh_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, UChar skip[])
+set_search_skip_table(UChar* s, UChar* end,
+                      OnigEncoding enc ARG_UNUSED, UChar skip[])
 {
   int i, len;
 
@@ -4572,7 +4574,8 @@ set_bmh_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, UChar skip[])
 #else
 /* set skip map for Boyer-Moore-Horspool search */
 static int
-set_bmh_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED, UChar skip[])
+set_search_skip_table(UChar* s, UChar* end,
+                      OnigEncoding enc ARG_UNUSED, UChar skip[])
 {
   int i, len;
 
@@ -5579,7 +5582,8 @@ set_optimize_exact(regex_t* reg, OptExact* e)
       ONIGENC_IS_ALLOWED_REVERSE_MATCH(reg->enc, reg->exact, reg->exact_end);
 
     if (e->len >= 3 || (e->len >= 2 && allow_reverse)) {
-      r = set_bmh_skip(reg->exact, reg->exact_end, reg->enc, reg->map);
+      r = set_search_skip_table(reg->exact, reg->exact_end,
+                                reg->enc, reg->map);
       if (r != 0) return r;
 
       reg->optimize = (allow_reverse != 0