Compat fixes for String#inspect wrt dummy UTF encodings.

See #2581.
jruby · Mar 16, 2015 · af940b1 · af940b1
1 parent 94bda8d
commit af940b1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2419,6 +2419,7 @@ public IRubyObject inspect19() {
         result.associateEncoding(resultEnc);
 
         boolean isUnicode = StringSupport.isUnicode(enc);
+        boolean asciiCompat = enc.isAsciiCompatible();
 
         EncodingDB.Entry e = null;
         CaseInsensitiveBytesHash<EncodingDB.Entry> encodings = runtime.getEncodingService().getEncodings();
@@ -2431,6 +2432,7 @@ public IRubyObject inspect19() {
             } else if (c0 == 0xFF && c1 == 0xFE) {
                 e = encodings.get("UTF-16LE".getBytes());
             } else {
+                e = encodings.get("ASCII-8BIT".getBytes());
                 isUnicode = false;
             }
         } else if (enc == encodings.get("UTF-32".getBytes()).getEncoding() && end - p > 3) {
@@ -2444,6 +2446,7 @@ public IRubyObject inspect19() {
             } else if (c3 == 0 && c2 == 0 && c1 == 0xFE && c0 == 0xFF) {
                 e = encodings.get("UTF-32LE".getBytes());
             } else {
+                e = encodings.get("ASCII-8BIT".getBytes());
                 isUnicode = false;
             }
         }
@@ -2468,13 +2471,13 @@ public IRubyObject inspect19() {
             }
             int c = enc.mbcToCode(bytes, p, end);
             p += n;
-            if ((enc.isAsciiCompatible() || isUnicode) &&
+            if ((asciiCompat || isUnicode) &&
                     (c == '"' || c == '\\' ||
                         (c == '#' && p < end && (StringSupport.preciseLength(enc, bytes, p, end) > 0) &&
                         (cc = codePoint(runtime, enc, bytes, p, end)) == '$' || cc == '@' || cc == '{'))) {
                 if (p - n > prev) result.cat(bytes, prev, p - n - prev);
                 result.cat('\\');
-                if (enc.isAsciiCompatible() || enc == resultEnc) {
+                if (asciiCompat || enc == resultEnc) {
                     prev = p - n;
                     continue;
                 }
@@ -2500,7 +2503,7 @@ public IRubyObject inspect19() {
                 continue;
             }
 
-            if ((enc == resultEnc && enc.isPrint(c)) || (enc.isAsciiCompatible() && Encoding.isAscii(c) && enc.isPrint(c))) {
+            if ((enc == resultEnc && enc.isPrint(c)) || (asciiCompat && Encoding.isAscii(c) && enc.isPrint(c))) {
                 continue;
             } else {
                 if (p - n > prev) result.cat(bytes, prev, p - n - prev);