Perlito5 - java - fix repeat-list in scalar context

fglock · Jul 18, 2017 · c974c3d · c974c3d
1 parent e6732fb
commit c974c3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/perlito5.pl b/perlito5.pl
@@ -23615,14 +23615,17 @@
         }
     }
     public static final PlObject list_replicate(PlArray o, PlObject c, int wantarray) {
+        if (wantarray == PlCx.SCALAR) {
+            return PerlOp.string_replicate(o.aget(-1), c);
+        }
         int count = c.to_int();
         PlArray a = new PlArray();
         if (count > 0) {
             for (int i = 0; i < count; i++) {
                 a.push( o );
             }
         }
-        return (wantarray == PlCx.LIST ) ? a : a.length_of_array();
+        return a;
     }
     public static final PlObject grep(PlClosure c, PlArray a, PlArray list__, int wantarray) {
         PlArray ret = new PlArray();

diff --git a/src5/lib/Perlito5/Java/Runtime.pm b/src5/lib/Perlito5/Java/Runtime.pm
@@ -1095,14 +1095,17 @@ class PerlOp {
         }
     }
     public static final PlObject list_replicate(PlArray o, PlObject c, int wantarray) {
+        if (wantarray == PlCx.SCALAR) {
+            return PerlOp.string_replicate(o.aget(-1), c);
+        }
         int count = c.to_int();
         PlArray a = new PlArray();
         if (count > 0) {
             for (int i = 0; i < count; i++) {
                 a.push( o );
             }
         }
-        return (wantarray == PlCx.LIST ) ? a : a.length_of_array();
+        return a;
     }
     public static final PlObject grep(PlClosure c, PlArray a, PlArray list__, int wantarray) {
         PlArray ret = new PlArray();