Add missing nonascii to ascii encodings.

jruby · Mar 15, 2017 · 7911cb1 · 7911cb1
1 parent 1274b35
commit 7911cb1
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/RubyConverter.java b/core/src/main/java/org/jruby/RubyConverter.java
@@ -28,6 +28,7 @@
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
 import org.jcodings.Ptr;
+import org.jcodings.specific.ISO8859_1Encoding;
 import org.jcodings.specific.UTF16BEEncoding;
 import org.jcodings.specific.UTF16LEEncoding;
 import org.jcodings.specific.UTF32BEEncoding;
@@ -95,9 +96,21 @@ public class RubyConverter extends RubyObject {
         NONASCII_TO_ASCII.put(UTF16LEEncoding.INSTANCE, UTF8Encoding.INSTANCE);
         NONASCII_TO_ASCII.put(UTF32BEEncoding.INSTANCE, UTF8Encoding.INSTANCE);
         NONASCII_TO_ASCII.put(UTF32LEEncoding.INSTANCE, UTF8Encoding.INSTANCE);
+        NONASCII_TO_ASCII.put(
+                EncodingDB.getEncodings().get("CP50220".getBytes()).getEncoding(),
+                EncodingDB.getEncodings().get("CP51932".getBytes()).getEncoding());
+        NONASCII_TO_ASCII.put(
+                EncodingDB.getEncodings().get("CP50221".getBytes()).getEncoding(),
+                EncodingDB.getEncodings().get("CP51932".getBytes()).getEncoding());
+        NONASCII_TO_ASCII.put(EncodingDB.getEncodings().get("IBM037".getBytes()).getEncoding(), ISO8859_1Encoding.INSTANCE);
+        NONASCII_TO_ASCII.put(EncodingDB.getEncodings().get("UTF-16".getBytes()).getEncoding(), UTF8Encoding.INSTANCE);
+        NONASCII_TO_ASCII.put(EncodingDB.getEncodings().get("UTF-32".getBytes()).getEncoding(), UTF8Encoding.INSTANCE);
         NONASCII_TO_ASCII.put(
                 EncodingDB.getEncodings().get("ISO-2022-JP".getBytes()).getEncoding(),
                 EncodingDB.getEncodings().get("stateless-ISO-2022-JP".getBytes()).getEncoding());
+        NONASCII_TO_ASCII.put(
+                EncodingDB.getEncodings().get("ISO-2022-JP-KDDI".getBytes()).getEncoding(),
+                EncodingDB.getEncodings().get("stateless-ISO-2022-JP-KDDI".getBytes()).getEncoding());
     }
 
     public static RubyClass createConverterClass(Ruby runtime) {