Adapt other 19 methods to new names

See #84
ruby · Mar 13, 2024 · d6cc31c · d6cc31c
1 parent d635776
commit d6cc31c
Showing 1 changed file with 42 additions and 12 deletions.
diff --git a/ext/java/org/jruby/ext/stringio/StringIO.java b/ext/java/org/jruby/ext/stringio/StringIO.java
@@ -940,7 +940,7 @@ private void strioExtend(ThreadContext context, int pos, int len) {
             if (pos + len > olen) {
                 string.resize(pos + len);
                 if (pos > olen) {
-                    string.modify19();
+                    modifyString(string);
                     ByteList ptrByteList = string.getByteList();
                     // zero the gap
                     int begin = ptrByteList.getBegin();
@@ -950,7 +950,7 @@ private void strioExtend(ThreadContext context, int pos, int len) {
                             (byte) 0);
                 }
             } else {
-                string.modify19();
+                modifyString(string);
             }
         } finally {
             if (locked) unlock(ptr);
@@ -962,11 +962,11 @@ private void strioExtend(ThreadContext context, int pos, int len) {
     public IRubyObject putc(ThreadContext context, IRubyObject ch) {
         Ruby runtime = context.runtime;
         checkWritable();
-        IRubyObject str;
+        IRubyObject str = null;
 
         checkModifiable();
         if (ch instanceof RubyString) {
-            str = ((RubyString)ch).substr19(runtime, 0, 1);
+            str = substrString((RubyString) ch, str, runtime);
         }
         else {
             byte c = RubyNumeric.num2chr(ch);
@@ -1501,20 +1501,54 @@ public IRubyObject write(ThreadContext context, IRubyObject[] args) {
     }
 
     private static final MethodHandle CAT_WITH_CODE_RANGE;
+    private static final MethodHandle MODIFY_AND_CLEAR_CODE_RANGE;
+    private static final MethodHandle SUBSTR_ENC;
 
     static {
-        MethodHandle cat;
+        MethodHandle cat, modify, substr;
+        MethodHandles.Lookup lookup = MethodHandles.publicLookup();
         try {
-            cat = MethodHandles.publicLookup().findVirtual(RubyString.class, "catWithCodeRange", MethodType.methodType(RubyString.class, RubyString.class));
+            cat = lookup.findVirtual(RubyString.class, "catWithCodeRange", MethodType.methodType(RubyString.class, RubyString.class));
+            modify = lookup.findVirtual(RubyString.class, "modifyAndClearCodeRange", MethodType.methodType(void.class));
+            substr = lookup.findVirtual(RubyString.class, "substrEnc", MethodType.methodType(IRubyObject.class, Ruby.class, int.class, int.class));
         } catch (NoSuchMethodException | IllegalAccessException ex) {
             try {
-                cat = MethodHandles.publicLookup().findVirtual(RubyString.class, "cat19", MethodType.methodType(RubyString.class, RubyString.class));
+                cat = lookup.findVirtual(RubyString.class, "cat19", MethodType.methodType(RubyString.class, RubyString.class));
+                modify = lookup.findVirtual(RubyString.class, "modify19", MethodType.methodType(void.class));
+                substr = lookup.findVirtual(RubyString.class, "substr19", MethodType.methodType(IRubyObject.class, Ruby.class, int.class, int.class));
             } catch (NoSuchMethodException | IllegalAccessException ex2) {
                 throw new ExceptionInInitializerError(ex2);
             }
         }
 
         CAT_WITH_CODE_RANGE = cat;
+        MODIFY_AND_CLEAR_CODE_RANGE = modify;
+        SUBSTR_ENC = substr;
+    }
+
+    private static void catString(RubyString myString, RubyString str) {
+        try {
+            RubyString unused = (RubyString) CAT_WITH_CODE_RANGE.invokeExact(myString, str);
+        } catch (Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    private static void modifyString(RubyString string) {
+        try {
+            MODIFY_AND_CLEAR_CODE_RANGE.invokeExact(string);
+        } catch (Throwable t) {
+            Helpers.throwException(t);
+        }
+    }
+
+    private static IRubyObject substrString(RubyString ch, IRubyObject str, Ruby runtime) {
+        try {
+            str = (IRubyObject) SUBSTR_ENC.invokeExact(ch, runtime, 0, 1);
+        } catch (Throwable t) {
+            Helpers.throwException(t);
+        }
+        return str;
     }
 
     // MRI: strio_write
@@ -1549,11 +1583,7 @@ private long stringIOWrite(ThreadContext context, Ruby runtime, IRubyObject arg)
                 if (enc == EncodingUtils.ascii8bitEncoding(runtime) || encStr == EncodingUtils.ascii8bitEncoding(runtime)) {
                     EncodingUtils.encStrBufCat(runtime, myString, strByteList, enc);
                 } else {
-                    try {
-                        RubyString unused = (RubyString) CAT_WITH_CODE_RANGE.invokeExact(myString, str);
-                    } catch (Throwable t) {
-                        throw new RuntimeException(t);
-                    }
+                    catString(myString, str);
                 }
             } else {
                 strioExtend(context, pos, len);