More tiny tweaks to reduce overhead of generateString

ruby · Jan 16, 2025 · 70aadd0 · 70aadd0
1 parent 7f9b6a3
commit 70aadd0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/java/src/json/ext/ByteListTranscoder.java b/java/src/json/ext/ByteListTranscoder.java
@@ -143,9 +143,11 @@ protected void quoteStart() {
      *               until the character before it.
      */
     protected void quoteStop(int endPos) throws IOException {
+        int quoteStart = this.quoteStart;
         if (quoteStart != -1) {
+            ByteList src = this.src;
             append(src.unsafeBytes(), src.begin() + quoteStart, endPos - quoteStart);
-            quoteStart = -1;
+            this.quoteStart = -1;
         }
     }
 

diff --git a/java/src/json/ext/StringEncoder.java b/java/src/json/ext/StringEncoder.java
@@ -107,10 +107,12 @@ final class StringEncoder extends ByteListTranscoder {
             //First byte of a 4+ byte code point
             4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 9, 9,
     };
+
     private static final byte[] BACKSLASH_U2028 = "\\u2028".getBytes(StandardCharsets.US_ASCII);
     private static final byte[] BACKSLASH_U2029 = "\\u2029".getBytes(StandardCharsets.US_ASCII);
 
     private final boolean asciiOnly, scriptSafe;
+    private final byte[] escapeTable;
 
     OutputStream out;
 
@@ -137,6 +139,11 @@ final class StringEncoder extends ByteListTranscoder {
     StringEncoder(boolean asciiOnly, boolean scriptSafe) {
         this.asciiOnly = asciiOnly;
         this.scriptSafe = scriptSafe;
+        if (asciiOnly) {
+            escapeTable = scriptSafe ? SCRIPT_SAFE_ESCAPE_TABLE : ASCII_ONLY_ESCAPE_TABLE;
+        } else {
+            escapeTable = scriptSafe ? SCRIPT_SAFE_ESCAPE_TABLE : ESCAPE_TABLE;
+        }
     }
 
     // C: generate_json_string
@@ -151,9 +158,9 @@ void generate(ThreadContext context, RubyString object, OutputStream buffer) thr
             case StringSupport.CR_7BIT:
             case StringSupport.CR_VALID:
                 if (asciiOnly) {
-                    encodeASCII(byteList, scriptSafe ? SCRIPT_SAFE_ESCAPE_TABLE : ASCII_ONLY_ESCAPE_TABLE);
+                    encodeASCII(byteList);
                 } else {
-                    encode(byteList, scriptSafe ? SCRIPT_SAFE_ESCAPE_TABLE : ESCAPE_TABLE);
+                    encode(byteList);
                 }
                 break;
             default:
@@ -201,20 +208,21 @@ private static RubyString tryWeirdEncodings(ThreadContext context, RubyString st
     }
 
     // C: convert_UTF8_to_JSON
-    void encode(ByteList src, byte[] escape_table) throws IOException {
+    void encode(ByteList src) throws IOException {
         byte[] hexdig = HEX;
         byte[] scratch = aux;
+        byte[] escapeTable = this.escapeTable;
 
         byte[] ptrBytes = src.unsafeBytes();
         int ptr = src.begin();
         int len = src.realSize();
 
         int beg = 0;
         int pos = 0;
-        
+
         while (pos < len) {
             int ch = Byte.toUnsignedInt(ptrBytes[ptr + pos]);
-            int ch_len = escape_table[ch];
+            int ch_len = escapeTable[ch];
             /* JSON encoding */
 
             if (ch_len > 0) {
@@ -278,9 +286,10 @@ private int flushPos(int pos, int beg, byte[] ptrBytes, int ptr, int size) throw
     }
 
     // C: convert_UTF8_to_ASCII_only_JSON
-    void encodeASCII(ByteList src, byte[] escape_table) throws IOException {
+    void encodeASCII(ByteList src) throws IOException {
         byte[] hexdig = HEX;
         byte[] scratch = aux;
+        byte[] escapeTable = this.escapeTable;
 
         byte[] ptrBytes = src.unsafeBytes();
         int ptr = src.begin();
@@ -291,7 +300,7 @@ void encodeASCII(ByteList src, byte[] escape_table) throws IOException {
 
         while (pos < len) {
             int ch = Byte.toUnsignedInt(ptrBytes[ptr + pos]);
-            int ch_len = escape_table[ch];
+            int ch_len = escapeTable[ch];
 
             if (ch_len != 0) {
                 switch (ch_len) {