Escape in Truffle::Ropes.debug_print_rope

Author: chrisseaton

src/main/java/org/truffleruby/core/rope/RopeNodes.java

@@ -747,7 +747,7 @@ protected Object debugPrintLeafRope(LeafRope rope, int currentLevel, boolean pri
 
             System.err.println(StringUtils.format(
                     "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; E: %s)",
-                    printString ? rope.toString() : "<skipped>",
+                    printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,
                     rope.byteLength(),
@@ -768,7 +768,7 @@ protected Object debugPrintSubstringRope(SubstringRope rope, int currentLevel, b
 
             System.err.println(StringUtils.format(
                     "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; O: %d; E: %s)",
-                    printString ? rope.toString() : "<skipped>",
+                    printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,
                     rope.byteLength(),
@@ -795,7 +795,7 @@ protected Object debugPrintConcatRopeBytes(ConcatRope rope, int currentLevel, bo
             if (state.isFlattened()) {
                 System.err.println(StringUtils.format(
                         "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; E: %s)",
-                        printString ? rope.toString() : "<skipped>",
+                        printString ? RopeOperations.escape(rope) : "<skipped>",
                         rope.getClass().getSimpleName(),
                         bytesAreNull,
                         rope.byteLength(),
@@ -805,7 +805,7 @@ protected Object debugPrintConcatRopeBytes(ConcatRope rope, int currentLevel, bo
             } else {
                 System.err.println(StringUtils.format(
                         "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; E: %s)",
-                        printString ? rope.toString() : "<skipped>",
+                        printString ? RopeOperations.escape(rope) : "<skipped>",
                         rope.getClass().getSimpleName(),
                         bytesAreNull,
                         rope.byteLength(),
@@ -830,7 +830,7 @@ protected Object debugPrintRepeatingRope(RepeatingRope rope, int currentLevel, b
 
             System.err.println(StringUtils.format(
                     "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; T: %d; D: %d; E: %s)",
-                    printString ? rope.toString() : "<skipped>",
+                    printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,
                     rope.byteLength(),
@@ -854,7 +854,7 @@ protected Object debugPrintLazyInt(LazyIntRope rope, int currentLevel, boolean p
 
             System.err.println(StringUtils.format(
                     "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; V: %d, D: %d; E: %s)",
-                    printString ? rope.toString() : "<skipped>",
+                    printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,
                     rope.byteLength(),

src/main/java/org/truffleruby/core/rope/RopeOperations.java

@@ -687,4 +687,32 @@ public static boolean anyChildContains(Rope rope, String value) {
         //   to worry about the risk of retaining a substring rope whose child contains the value.
         return rope.byteLength() >= value.length() && RopeOperations.decodeRope(rope).contains(value);
     }
+
+    public static String escape(Rope rope) {
+        final StringBuilder builder = new StringBuilder();
+        builder.append('"');
+
+        for (int i = 0; i < rope.byteLength(); i++) {
+            final byte character = rope.get(i);
+            switch (character) {
+                case '\\':
+                    builder.append("\\");
+                    break;
+                case '"':
+                    builder.append("\\\"");
+                    break;
+                default:
+                    if (character >= 32 && character <= 126) {
+                        builder.append((char) character);
+                    } else {
+                        builder.append(StringUtils.format("\\x%02x", character));
+                    }
+                    break;
+            }
+        }
+
+        builder.append('"');
+        return builder.toString();
+    }
+
 }

src/main/java/org/truffleruby/core/rope/TruffleRopesNodes.java

@@ -116,13 +116,13 @@ protected static String getStructure(Rope rope) {
         }
 
         private static String getStructure(LeafRope rope) {
-            return escape(rope);
+            return RopeOperations.escape(rope);
         }
 
         private static String getStructure(ConcatRope rope) {
             final ConcatState state = rope.getState();
             return state.isFlattened()
-                    ? "(\"flat concat rope\"; " + escape(rope) + ")"
+                    ? "(\"flat concat rope\"; " + RopeOperations.escape(rope) + ")"
                     : "(" + getStructure(state.left) + " + " + getStructure(state.right) + ")";
         }
 
@@ -137,33 +137,6 @@ private static String getStructure(RepeatingRope rope) {
             return "(" + getStructure(rope.getChild()) + "*" + rope.getTimes() + ")";
         }
 
-        private static String escape(Rope rope) {
-            final StringBuilder builder = new StringBuilder();
-            builder.append('"');
-
-            for (int i = 0; i < rope.byteLength(); i++) {
-                final byte character = rope.get(i);
-                switch (character) {
-                    case '\\':
-                        builder.append("\\");
-                        break;
-                    case '"':
-                        builder.append("\\\"");
-                        break;
-                    default:
-                        if (character >= 32 && character <= 126) {
-                            builder.append((char) character);
-                        } else {
-                            builder.append(StringUtils.format("\\x%02x", character));
-                        }
-                        break;
-                }
-            }
-
-            builder.append('"');
-            return builder.toString();
-        }
-
     }
 
     @CoreMethod(names = "bytes?", onSingleton = true, required = 1)