Update release notes, minor naming wrt #220

FasterXML · Feb 4, 2025 · 24a7585 · 24a7585
1 parent b0a292e
commit 24a7585
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/release-notes/CREDITS b/release-notes/CREDITS
@@ -116,3 +116,8 @@ Philipp Nanz (@philippn)
  (7.1.0)
 * Contributed #211: Disable `resolveEntityReferences` by default for newly created SAX parsers
  (7.1.0)
+
+Winfried Gerlach (@winfriedgerlach)
+
+* Contributed #220: Switch to lookup tables in hotspots `isNameChar()`/`isNameStartChar()`
+ (7.1.1)
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -9,7 +9,7 @@ Project: woodstox
 #213: SAX: `Locator#getSystemId` and `Locator#getPublicId` are not
   available during `startDocument` event
  (fix contributed by Philipp N)
-#221: Switch to lookup tables in hotspots `isNameChar()`/`isNameStartChar()`
+#220: Switch to lookup tables in hotspots `isNameChar()`/`isNameStartChar()`
  (contributed by @winfriedgerlach)
 
 7.1.0 (22-Oct-2024)

diff --git a/src/main/java/com/ctc/wstx/io/WstxInputData.java b/src/main/java/com/ctc/wstx/io/WstxInputData.java
@@ -52,21 +52,23 @@ public class WstxInputData
      */
     public final static int MAX_UNICODE_CHAR = 0x10FFFF;
 
-    private static final boolean[] asciiNameStartChars = new boolean[128];
+    // @since 7.1.1
+    private static final boolean[] ASCII_NAME_START_CHARS = new boolean[128];
     static {
-        IntStream.rangeClosed('a', 'z').forEach(i -> asciiNameStartChars[i] = true);
-        IntStream.rangeClosed('A', 'Z').forEach(i -> asciiNameStartChars[i] = true);
-        asciiNameStartChars['_'] = true;
+        IntStream.rangeClosed('a', 'z').forEach(i -> ASCII_NAME_START_CHARS[i] = true);
+        IntStream.rangeClosed('A', 'Z').forEach(i -> ASCII_NAME_START_CHARS[i] = true);
+        ASCII_NAME_START_CHARS['_'] = true;
     }
 
-    private static final boolean[] asciiNameChars = new boolean[128];
+    // @since 7.1.1
+    private static final boolean[] ASCII_NAME_CHARS = new boolean[128];
     static {
-        IntStream.rangeClosed('a', 'z').forEach(i -> asciiNameChars[i] = true);
-        IntStream.rangeClosed('A', 'Z').forEach(i -> asciiNameChars[i] = true);
-        IntStream.rangeClosed('0', '9').forEach(i -> asciiNameChars[i] = true);
-        asciiNameChars['.'] = true;
-        asciiNameChars['-'] = true;
-        asciiNameChars['_'] = true;
+        IntStream.rangeClosed('a', 'z').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        IntStream.rangeClosed('A', 'Z').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        IntStream.rangeClosed('0', '9').forEach(i -> ASCII_NAME_CHARS[i] = true);
+        ASCII_NAME_CHARS['.'] = true;
+        ASCII_NAME_CHARS['-'] = true;
+        ASCII_NAME_CHARS['_'] = true;
     }
 
     /*
@@ -174,7 +176,7 @@ protected final boolean isNameStartChar(char c)
          */
         if (c < 128) {
             // this is performance critical, so we use a lookup table instead of if-branches
-            return asciiNameStartChars[c];
+            return ASCII_NAME_START_CHARS[c];
         }
         /* Ok, otherwise need to use a big honking bit sets... which
          * differ between 1.0 and 1.1
@@ -194,7 +196,7 @@ protected final boolean isNameChar(char c)
         // First, let's handle 7-bit ascii range
         if (c < 128) {
             // this is performance critical, so we use a lookup table instead of if-branches
-            return asciiNameChars[c];
+            return ASCII_NAME_CHARS[c];
         }
         return mXml11 ? XmlChars.is11NameChar(c) : XmlChars.is10NameChar(c);
     }