disable int skip map if opt exact max length threshold < 256

jruby · Sep 29, 2018 · 495de01 · 495de01
1 parent 11d8253
commit 495de01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/org/joni/Config.java b/src/org/joni/Config.java
@@ -45,6 +45,7 @@ public interface Config extends org.jcodings.Config {
     final boolean USE_SUNDAY_QUICK_SEARCH = true;
     final boolean USE_CEC = false;
     final boolean USE_DYNAMIC_OPTION = false;
+    final boolean USE_BYTE_MAP = OptExactInfo.OPT_EXACT_MAXLEN <= CHAR_TABLE_SIZE;
     final boolean USE_INT_MAP_BACKWARD = false;
 
     final int NREGION                   = 10;

diff --git a/src/org/joni/Regex.java b/src/org/joni/Regex.java
@@ -292,7 +292,7 @@ boolean setupBMSkipMap(boolean ignoreCase) {
         byte[]buf = new byte[Config.ENC_GET_CASE_FOLD_CODES_MAX_NUM * Config.ENC_MBC_CASE_FOLD_MAXLEN];
 
         final int ilen = USE_SUNDAY_QUICK_SEARCH ? len : len - 1;
-        if (len < Config.CHAR_TABLE_SIZE) {
+        if (Config.USE_BYTE_MAP || len < Config.CHAR_TABLE_SIZE) {
             if (map == null) map = new byte[Config.CHAR_TABLE_SIZE]; // map/skip
             for (int i = 0; i < Config.CHAR_TABLE_SIZE; i++) map[i] = (byte)(USE_SUNDAY_QUICK_SEARCH ? len + 1 : len);
 

diff --git a/src/org/joni/Search.java b/src/org/joni/Search.java
@@ -324,7 +324,7 @@ final int search(Matcher matcher, byte[]text, int textP, int textEnd, int textRa
             }
             if (end > textEnd) end = textEnd;
 
-            if (regex.intMap == null) {
+            if (Config.USE_BYTE_MAP || regex.intMap == null) {
                 while (s < end) {
                     int p = s;
                     int t = tail;
@@ -433,7 +433,7 @@ final int search(Matcher matcher, byte[]text, int textP, int textEnd, int textRa
             }
             if (end > textEnd) end = textEnd;
 
-            if (regex.intMap == null) {
+            if (Config.USE_BYTE_MAP || regex.intMap == null) {
                 while (s < end) {
                     int p = USE_SUNDAY_QUICK_SEARCH ? s - tlen1 : s - (targetEnd - targetP) + 1;
                     if (lowerCaseMatch(target, targetP, targetEnd, text, p, s + 1, enc, buf, regex.caseFoldFlag)) return p;
@@ -474,7 +474,7 @@ final int search(Matcher matcher, byte[]text, int textP, int textEnd, int textRa
             if (end + tlen1 > textEnd) end = textEnd - tlen1;
             int s = textP, p, se;
 
-            if (regex.intMap == null) {
+            if (Config.USE_BYTE_MAP || regex.intMap == null) {
                 while (s < end) {
                     p = se = s + tlen1;
                     int t = tail;
@@ -531,7 +531,7 @@ final int search(Matcher matcher, byte[]text, int textP, int textEnd, int textRa
             if (end + tlen1 > textEnd) end = textEnd - tlen1;
             int s = textP;
 
-            if (regex.intMap == null) {
+            if (Config.USE_BYTE_MAP || regex.intMap == null) {
                 while (s < end) {
                     int se = s + tlen1;
                     if (lowerCaseMatch(target, targetP, targetEnd, text, s, se + 1, enc, buf, regex.caseFoldFlag)) return s;