"inline" kwargs handling for String.new encoding: ... + restore initi…

…alize compatibility
jruby · Dec 13, 2015 · a3c648d · a3c648d · cheald · Dec 13, 2015
1 parent cdfd906
commit a3c648d
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1477,8 +1477,8 @@ public IRubyObject initialize(ThreadContext context) {
         return initialize19(context);
     }
 
-    public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
-        return initialize19(context, args);
+    public IRubyObject initialize(ThreadContext context, IRubyObject arg0) {
+        return initialize19(context, new IRubyObject[] { arg0 });
     }
 
     @JRubyMethod(name = "initialize", visibility = PRIVATE)
@@ -1487,20 +1487,25 @@ public IRubyObject initialize19(ThreadContext context) {
         return this;
     }
 
-    // TODO: Fold kwargs into the @JRubyMethod decorator
-    final static String[] validInitializeArgs = new String[]{"encoding"};
-
     @JRubyMethod(name = "initialize", visibility = PRIVATE, optional = 2)
     public IRubyObject initialize19(ThreadContext context, IRubyObject[] args) {
-        IRubyObject[] extractedArgs = ArgsUtil.extractKeywordArgs(context, args, validInitializeArgs);
+        if ( args.length == 0 ) return this;
 
-        if ((args.length == 1 && extractedArgs == null) || args.length > 1) {
-            replace19(args[0]);
-        }
+        IRubyObject arg = args[ args.length - 1 ];
 
-        if (extractedArgs != null) {
-            force_encoding(context, extractedArgs[0]);
+        final IRubyObject string; final IRubyObject encoding;
+        if ( arg instanceof RubyHash ) { // new encoding: ...
+            final RubySymbol enc = context.runtime.newSymbol("encoding");
+            encoding = ( (RubyHash) arg ).fastARef(enc);
+            string = args.length > 1 ? args[0] : null;
+        }
+        else {
+            string = arg; encoding = null;
         }
+
+        if ( string != null ) replace19(string);
+        if ( encoding != null ) force_encoding(context, encoding);
+
         return this;
     }