# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1398406452 -7200
# Node ID b5c7970a39e6bed439bf12fd9a94be8cef3ef28c
# Parent  2af07db15110bb34118f3f831a9a936cb91921be
Backporting expandArray fixes to make all rt/vm tests pass on Nashorn

diff -r 2af07db15110 -r b5c7970a39e6 rt/emul/mini/src/main/java/java/lang/String.java
--- a/rt/emul/mini/src/main/java/java/lang/String.java	Thu Apr 24 18:05:21 2014 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/String.java	Fri Apr 25 08:14:12 2014 +0200
@@ -984,12 +984,12 @@
                 continue;
             }
             if (v < 0x0800) {
-                arr = System.expandArray(arr, i + 1);
+                arr = System.expandArray(arr, arr.length + 1);
                 arr[i++] = (byte) (0xC0 | (v >> 6));
                 arr[i++] = (byte) (0x80 | (0x3F & v));
                 continue;
             }
-            arr = System.expandArray(arr, i + 2);
+            arr = System.expandArray(arr, arr.length + 2);
             arr[i++] = (byte) (0xE0 | (v >> 12));
             arr[i++] = (byte) (0x80 | ((v >> 6) & 0x7F));
             arr[i++] = (byte) (0x80 | (0x3F & v));
diff -r 2af07db15110 -r b5c7970a39e6 rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java
--- a/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Thu Apr 24 18:05:21 2014 +0200
+++ b/rt/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Fri Apr 25 08:14:12 2014 +0200
@@ -50,12 +50,12 @@
     }
 
     @JavaScriptBody(args = { "arr", "expectedSize" }, body = 
-        "while (expectedSize-- > arr.length) { arr.push(0); }; return arr;"
+        "while (expectedSize > arr.length) { arr.push(0); }; return arr;"
     )
     public static native byte[] expandArray(byte[] arr, int expectedSize);
 
     @JavaScriptBody(args = { "arr", "expectedSize" }, body = 
-        "while (expectedSize-- > arr.length) { arr.push(0); }; return arr;"
+        "while (expectedSize > arr.length) { arr.push(0); }; return arr;"
     )
     public static native char[] expandArray(char[] arr, int expectedSize);