Tweaks for String#concat and String#<<. #4293

jruby · Nov 22, 2016 · 12f3b2c · 12f3b2c
1 parent b410c61
commit 12f3b2c
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2238,8 +2238,8 @@ public RubyString append19(IRubyObject other) {
     /** rb_str_concat
      *
      */
-    @JRubyMethod(name = {"concat", "<<"})
-    public RubyString concat(ThreadContext context, IRubyObject other) {
+    @JRubyMethod(name = "<<")
+    public RubyString concatSingle(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
         if (other instanceof RubyFixnum) {
             long c = RubyNumeric.num2long(other);
@@ -2262,7 +2262,15 @@ public RubyString concat(ThreadContext context, IRubyObject other) {
     /** rb_str_concat
      *
      */
-    @JRubyMethod(name = {"concat", "<<"}, rest = true)
+    @JRubyMethod(name = {"concat"})
+    public RubyString concat(ThreadContext context, IRubyObject obj) {
+        return concatSingle(context, obj);
+    }
+
+    /** rb_str_concat_multi
+     *
+     */
+    @JRubyMethod(name = {"concat"}, rest = true)
     public RubyString concat(ThreadContext context, IRubyObject[] objs) {
         Ruby runtime = context.runtime;
 
@@ -2272,10 +2280,10 @@ public RubyString concat(ThreadContext context, IRubyObject[] objs) {
             RubyString tmp = newStringLight(runtime, objs.length, getEncoding());
 
             for (IRubyObject obj : objs) {
-                tmp.concat(context, obj);
+                tmp.concatSingle(context, obj);
             }
 
-            append(tmp);
+            append19(tmp);
         }
 
         return this;