[GR-17457] Update ASCIIEncoding.INSTANCE.isSpace to StringSupport.isAsciiSpace

PullRequest: truffleruby/3237

Author: bjfish

src/main/java/org/truffleruby/core/regexp/ClassicRegexp.java

@@ -45,7 +45,6 @@
 import java.util.Iterator;
 
 import org.jcodings.Encoding;
-import org.jcodings.specific.ASCIIEncoding;
 import org.jcodings.specific.USASCIIEncoding;
 import org.joni.NameEntry;
 import org.joni.Option;
@@ -281,7 +280,7 @@ private static int unescapeUnicodeBmp(RopeBuilder to, byte[] bytes, int p, int e
 
     private static int unescapeUnicodeList(RopeBuilder to, byte[] bytes, int p, int end,
             RubyEncoding[] encp, Rope str, RegexpSupport.ErrorMode mode) throws DeferredRaiseException {
-        while (p < end && ASCIIEncoding.INSTANCE.isSpace(bytes[p] & 0xff)) {
+        while (p < end && StringSupport.isAsciiSpace(bytes[p] & 0xff)) {
             p++;
         }
 
@@ -300,7 +299,7 @@ private static int unescapeUnicodeList(RopeBuilder to, byte[] bytes, int p, int
                 appendUtf8(to, code, encp, str, mode);
             }
             hasUnicode = true;
-            while (p < end && ASCIIEncoding.INSTANCE.isSpace(bytes[p] & 0xff)) {
+            while (p < end && StringSupport.isAsciiSpace(bytes[p] & 0xff)) {
                 p++;
             }
         }

src/main/java/org/truffleruby/core/string/StringNodes.java

@@ -1804,15 +1804,15 @@ protected Object lstripBangSingleByte(RubyString string,
             // Check the first code point to see if it's a space. In the case of strings without leading spaces,
             // this check can avoid having to materialize the entire byte[] (a potentially expensive operation
             // for ropes) and can avoid having to compile the while loop.
-            if (noopProfile.profile(!isSpace(firstCodePoint))) {
+            if (noopProfile.profile(!StringSupport.isAsciiSpaceOrNull(firstCodePoint))) {
                 return nil;
             }
 
             final int end = rope.byteLength();
             final byte[] bytes = bytesNode.execute(rope);
 
             int p = 0;
-            while (p < end && isSpace(bytes[p])) {
+            while (p < end && StringSupport.isAsciiSpaceOrNull(bytes[p])) {
                 p++;
             }
 
@@ -1838,7 +1838,7 @@ protected Object lstripBang(RubyString string,
             int p = s;
             while (p < end) {
                 int c = getCodePointNode.executeGetCodePoint(enc, rope, p);
-                if (!(c == 0 || ASCIIEncoding.INSTANCE.isSpace(c))) {
+                if (!StringSupport.isAsciiSpaceOrNull(c)) {
                     break;
                 }
                 p += StringSupport.codeLength(enc.jcoding, c);
@@ -1853,9 +1853,6 @@ protected Object lstripBang(RubyString string,
             return nil;
         }
 
-        private boolean isSpace(int c) {
-            return c == 0 || StringSupport.isAsciiSpace(c);
-        }
     }
 
     @CoreMethod(names = "ord")
@@ -1935,7 +1932,7 @@ protected Object rstripBangSingleByte(RubyString string,
             // Check the last code point to see if it's a space or NULL. In the case of strings without leading spaces,
             // this check can avoid having to materialize the entire byte[] (a potentially expensive operation
             // for ropes) and can avoid having to compile the while loop.
-            final boolean willStrip = lastCodePoint == 0x00 || StringSupport.isAsciiSpace(lastCodePoint);
+            final boolean willStrip = StringSupport.isAsciiSpaceOrNull(lastCodePoint);
             if (noopProfile.profile(!willStrip)) {
                 return nil;
             }
@@ -1944,7 +1941,7 @@ protected Object rstripBangSingleByte(RubyString string,
             final byte[] bytes = bytesNode.execute(rope);
 
             int endp = end - 1;
-            while (endp >= 0 && (bytes[endp] == 0 || StringSupport.isAsciiSpace(bytes[endp]))) {
+            while (endp >= 0 && StringSupport.isAsciiSpaceOrNull(bytes[endp])) {
                 endp--;
             }
 
@@ -1979,7 +1976,7 @@ protected Object rstripBang(RubyString string,
             int prev;
             while ((prev = prevCharHead(enc.jcoding, bytes, start, endp, end)) != -1) {
                 int point = getCodePointNode.executeGetCodePoint(enc, rope, prev);
-                if (point != 0 && !ASCIIEncoding.INSTANCE.isSpace(point)) {
+                if (!StringSupport.isAsciiSpaceOrNull(point)) {
                     break;
                 }
                 endp = prev;

src/main/java/org/truffleruby/core/string/StringSupport.java

@@ -1670,6 +1670,10 @@ public static boolean isAsciiSpace(int c) {
         return c == ' ' || ('\t' <= c && c <= '\r');
     }
 
+    static boolean isAsciiSpaceOrNull(int c) {
+        return c == 0 || isAsciiSpace(c);
+    }
+
     public static boolean isAsciiPrintable(int c) {
         return c == ' ' || (c >= '!' && c <= '~');
     }