Reland "Change the order of arguments of the (One|Two)ByteSeqStringSetChar intrinsic."

src/uri.js

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 "use strict";
 
 // This file relies on the fact that the following declaration has been made
 // in runtime.js:
 // var $Array = global.Array;
 
@@ skipping 154 matching lines @@
           } else {
             throw new $URIError("URI malformed");
           }
         }
       }
     }
     if (0xD800 <= value && value <= 0xDFFF) {
       throw new $URIError("URI malformed");
     }
     if (value < 0x10000) {
-      %_TwoByteSeqStringSetChar(result, index++, value);
+      %_TwoByteSeqStringSetChar(index++, value, result);
     } else {
-      %_TwoByteSeqStringSetChar(result, index++, (value >> 10) + 0xd7c0);
-      %_TwoByteSeqStringSetChar(result, index++, (value & 0x3ff) + 0xdc00);
+      %_TwoByteSeqStringSetChar(index++, (value >> 10) + 0xd7c0, result);
+      %_TwoByteSeqStringSetChar(index++, (value & 0x3ff) + 0xdc00, result);
     }
     return index;
   }
 
   // ECMA-262, section 15.1.3
   function Encode(uri, unescape) {
     var uriLength = uri.length;
     var array = new InternalArray(uriLength);
     var index = 0;
     for (var k = 0; k < uriLength; k++) {
       var cc1 = uri.charCodeAt(k);
       if (unescape(cc1)) {
         array[index++] = cc1;
       } else {
         if (cc1 >= 0xDC00 && cc1 <= 0xDFFF) throw new $URIError("URI malformed");
         if (cc1 < 0xD800 || cc1 > 0xDBFF) {
           index = URIEncodeSingle(cc1, array, index);
         } else {
           k++;
           if (k == uriLength) throw new $URIError("URI malformed");
           var cc2 = uri.charCodeAt(k);
           if (cc2 < 0xDC00 || cc2 > 0xDFFF) throw new $URIError("URI malformed");
           index = URIEncodePair(cc1, cc2, array, index);
         }
       }
     }
 
     var result = %NewString(array.length, NEW_ONE_BYTE_STRING);
     for (var i = 0; i < array.length; i++) {
-      %_OneByteSeqStringSetChar(result, i, array[i]);
+      %_OneByteSeqStringSetChar(i, array[i], result);
     }
     return result;
   }
 
   // ECMA-262, section 15.1.3
   function Decode(uri, reserved) {
     var uriLength = uri.length;
     var one_byte = %NewString(uriLength, NEW_ONE_BYTE_STRING);
     var index = 0;
     var k = 0;
 
     // Optimistically assume one-byte string.
     for ( ; k < uriLength; k++) {
       var code = uri.charCodeAt(k);
       if (code == 37) {  // '%'
         if (k + 2 >= uriLength) throw new $URIError("URI malformed");
         var cc = URIHexCharsToCharCode(uri.charCodeAt(k+1), uri.charCodeAt(k+2));
         if (cc >> 7) break;  // Assumption wrong, two-byte string.
         if (reserved(cc)) {
-          %_OneByteSeqStringSetChar(one_byte, index++, 37);  // '%'.
-          %_OneByteSeqStringSetChar(one_byte, index++, uri.charCodeAt(k+1));
-          %_OneByteSeqStringSetChar(one_byte, index++, uri.charCodeAt(k+2));
+          %_OneByteSeqStringSetChar(index++, 37, one_byte);  // '%'.
+          %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+1), one_byte);
+          %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+2), one_byte);
         } else {
-          %_OneByteSeqStringSetChar(one_byte, index++, cc);
+          %_OneByteSeqStringSetChar(index++, cc, one_byte);
         }
         k += 2;
       } else {
         if (code > 0x7f) break;  // Assumption wrong, two-byte string.
-        %_OneByteSeqStringSetChar(one_byte, index++, code);
+        %_OneByteSeqStringSetChar(index++, code, one_byte);
       }
     }
 
     one_byte = %TruncateString(one_byte, index);
     if (k == uriLength) return one_byte;
 
     // Write into two byte string.
     var two_byte = %NewString(uriLength - k, NEW_TWO_BYTE_STRING);
     index = 0;
 
     for ( ; k < uriLength; k++) {
       var code = uri.charCodeAt(k);
       if (code == 37) {  // '%'
         if (k + 2 >= uriLength) throw new $URIError("URI malformed");
         var cc = URIHexCharsToCharCode(uri.charCodeAt(++k), uri.charCodeAt(++k));
         if (cc >> 7) {
           var n = 0;
           while (((cc << ++n) & 0x80) != 0) { }
           if (n == 1 || n > 4) throw new $URIError("URI malformed");
           var octets = new $Array(n);
           octets[0] = cc;
           if (k + 3 * (n - 1) >= uriLength) throw new $URIError("URI malformed");
           for (var i = 1; i < n; i++) {
             if (uri.charAt(++k) != '%') throw new $URIError("URI malformed");
             octets[i] = URIHexCharsToCharCode(uri.charCodeAt(++k),
                                               uri.charCodeAt(++k));
           }
           index = URIDecodeOctets(octets, two_byte, index);
         } else  if (reserved(cc)) {
-          %_TwoByteSeqStringSetChar(two_byte, index++, 37);  // '%'.
-          %_TwoByteSeqStringSetChar(two_byte, index++, uri.charCodeAt(k - 1));
-          %_TwoByteSeqStringSetChar(two_byte, index++, uri.charCodeAt(k));
+          %_TwoByteSeqStringSetChar(index++, 37, two_byte);  // '%'.
+          %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k - 1), two_byte);
+          %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k), two_byte);
         } else {
-          %_TwoByteSeqStringSetChar(two_byte, index++, cc);
+          %_TwoByteSeqStringSetChar(index++, cc, two_byte);
         }
       } else {
-        %_TwoByteSeqStringSetChar(two_byte, index++, code);
+        %_TwoByteSeqStringSetChar(index++, code, two_byte);
       }
     }
 
     two_byte = %TruncateString(two_byte, index);
     return one_byte + two_byte;
   }
 
   // -------------------------------------------------------------------
   // Define exported functions.
 
@@ skipping 98 matching lines @@
   InstallFunctions(global, DONT_ENUM, $Array(
       "escape", URIEscapeJS,
       "unescape", URIUnescapeJS,
       "decodeURI", URIDecode,
       "decodeURIComponent", URIDecodeComponent,
       "encodeURI", URIEncode,
       "encodeURIComponent", URIEncodeComponent
   ));
 
 })();