[Truffle] String#% now uses the encoding of the format string.

jruby · Jan 14, 2015 · 0fb7e04 · 0fb7e04
1 parent 85f99ff
commit 0fb7e04
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -178,10 +178,10 @@ private RubyString formatSlow(RubyString format, Object[] args) {
 
             if (args.length == 1 && args[0] instanceof RubyArray) {
                 singleArrayProfile.enter();
-                return context.makeString(StringFormatter.format(getContext(), format.toString(), Arrays.asList(((RubyArray) args[0]).slowToArray())));
+                return context.makeString(StringFormatter.format(getContext(), format.toString(), Arrays.asList(((RubyArray) args[0]).slowToArray())), format.getByteList().getEncoding());
             } else {
                 multipleArgumentsProfile.enter();
-                return context.makeString(StringFormatter.format(getContext(), format.toString(), Arrays.asList(args)));
+                return context.makeString(StringFormatter.format(getContext(), format.toString(), Arrays.asList(args)), format.getByteList().getEncoding());
             }
         }
     }

diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java b/core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
@@ -249,6 +249,10 @@ public RubyString makeString(String string) {
         return RubyString.fromJavaString(coreLibrary.getStringClass(), string);
     }
 
+    public RubyString makeString(String string, Encoding encoding) {
+        return RubyString.fromJavaString(coreLibrary.getStringClass(), string, encoding);
+    }
+
     public RubyString makeString(char string) {
         return makeString(Character.toString(string));
     }

diff --git a/core/src/main/java/org/jruby/truffle/runtime/core/RubyString.java b/core/src/main/java/org/jruby/truffle/runtime/core/RubyString.java
@@ -39,6 +39,10 @@ public static RubyString fromJavaString(RubyClass stringClass, String string) {
         return new RubyString(stringClass, new ByteList(org.jruby.RubyEncoding.encodeUTF8(string), USASCIIEncoding.INSTANCE, false));
     }
 
+    public static RubyString fromJavaString(RubyClass stringClass, String string, Encoding encoding) {
+        return new RubyString(stringClass, new ByteList(org.jruby.RubyEncoding.encodeUTF8(string), encoding, false));
+    }
+
     public static RubyString fromByteList(RubyClass stringClass, ByteList bytes) {
         return new RubyString(stringClass, bytes);
     }