Migrate error messages, part 5 (array.js and i18n.js).

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.
 
 // This file contains support for URI manipulations written in
 // JavaScript.
 
 (function() {
 
 "use strict";
@@ skipping 79 matching lines @@
   octets[0] = (u >> 2) + 240;
   octets[1] = (((u & 3) << 4) | w) + 128;
   octets[2] = ((x << 4) | y) + 128;
   octets[3] = z + 128;
   return URIEncodeOctets(octets, result, index);
 }
 
 function URIHexCharsToCharCode(highChar, lowChar) {
   var highCode = HexValueOf(highChar);
   var lowCode = HexValueOf(lowChar);
-  if (highCode == -1 || lowCode == -1) {
-    throw new $URIError("URI malformed");
-  }
+  if (highCode == -1 || lowCode == -1) throw MakeURIError();
   return (highCode << 4) | lowCode;
 }
 
 // Callers must ensure that |result| is a sufficiently long sequential
 // two-byte string!
 function URIDecodeOctets(octets, result, index) {
   var value;
   var o0 = octets[0];
   if (o0 < 0x80) {
     value = o0;
   } else if (o0 < 0xc2) {
-    throw new $URIError("URI malformed");
+    throw MakeURIError();
   } else {
     var o1 = octets[1];
     if (o0 < 0xe0) {
       var a = o0 & 0x1f;
-      if ((o1 < 0x80) || (o1 > 0xbf)) {
-        throw new $URIError("URI malformed");
-      }
+      if ((o1 < 0x80) || (o1 > 0xbf)) throw MakeURIError();
       var b = o1 & 0x3f;
       value = (a << 6) + b;
-      if (value < 0x80 || value > 0x7ff) {
-        throw new $URIError("URI malformed");
-      }
+      if (value < 0x80 || value > 0x7ff) throw MakeURIError();
     } else {
       var o2 = octets[2];
       if (o0 < 0xf0) {
         var a = o0 & 0x0f;
-        if ((o1 < 0x80) || (o1 > 0xbf)) {
-          throw new $URIError("URI malformed");
-        }
+        if ((o1 < 0x80) || (o1 > 0xbf)) throw MakeURIError();
         var b = o1 & 0x3f;
-        if ((o2 < 0x80) || (o2 > 0xbf)) {
-          throw new $URIError("URI malformed");
-        }
+        if ((o2 < 0x80) || (o2 > 0xbf)) throw MakeURIError();
         var c = o2 & 0x3f;
         value = (a << 12) + (b << 6) + c;
-        if ((value < 0x800) || (value > 0xffff)) {
-          throw new $URIError("URI malformed");
-        }
+        if ((value < 0x800) || (value > 0xffff)) throw MakeURIError();
       } else {
         var o3 = octets[3];
         if (o0 < 0xf8) {
           var a = (o0 & 0x07);
-          if ((o1 < 0x80) || (o1 > 0xbf)) {
-            throw new $URIError("URI malformed");
-          }
+          if ((o1 < 0x80) || (o1 > 0xbf)) throw MakeURIError();
           var b = (o1 & 0x3f);
           if ((o2 < 0x80) || (o2 > 0xbf)) {
-            throw new $URIError("URI malformed");
+            throw MakeURIError();
           }
           var c = (o2 & 0x3f);
-          if ((o3 < 0x80) || (o3 > 0xbf)) {
-            throw new $URIError("URI malformed");
-          }
+          if ((o3 < 0x80) || (o3 > 0xbf)) throw MakeURIError();
           var d = (o3 & 0x3f);
           value = (a << 18) + (b << 12) + (c << 6) + d;
-          if ((value < 0x10000) || (value > 0x10ffff)) {
-            throw new $URIError("URI malformed");
-          }
+          if ((value < 0x10000) || (value > 0x10ffff)) throw MakeURIError();
         } else {
-          throw new $URIError("URI malformed");
+          throw MakeURIError();
         }
       }
     }
   }
-  if (0xD800 <= value && value <= 0xDFFF) {
-    throw new $URIError("URI malformed");
-  }
+  if (0xD800 <= value && value <= 0xDFFF) throw MakeURIError();
   if (value < 0x10000) {
     %_TwoByteSeqStringSetChar(index++, value, result);
   } else {
     %_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 >= 0xDC00 && cc1 <= 0xDFFF) throw MakeURIError();
       if (cc1 < 0xD800 || cc1 > 0xDBFF) {
         index = URIEncodeSingle(cc1, array, index);
       } else {
         k++;
-        if (k == uriLength) throw new $URIError("URI malformed");
+        if (k == uriLength) throw MakeURIError();
         var cc2 = uri.charCodeAt(k);
-        if (cc2 < 0xDC00 || cc2 > 0xDFFF) throw new $URIError("URI malformed");
+        if (cc2 < 0xDC00 || cc2 > 0xDFFF) throw MakeURIError();
         index = URIEncodePair(cc1, cc2, array, index);
       }
     }
   }
 
   var result = %NewString(array.length, NEW_ONE_BYTE_STRING);
   for (var i = 0; i < array.length; 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");
+      if (k + 2 >= uriLength) throw MakeURIError();
       var cc = URIHexCharsToCharCode(uri.charCodeAt(k+1), uri.charCodeAt(k+2));
       if (cc >> 7) break;  // Assumption wrong, two-byte string.
       if (reserved(cc)) {
         %_OneByteSeqStringSetChar(index++, 37, one_byte);  // '%'.
         %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+1), one_byte);
         %_OneByteSeqStringSetChar(index++, uri.charCodeAt(k+2), one_byte);
       } else {
         %_OneByteSeqStringSetChar(index++, cc, one_byte);
       }
       k += 2;
     } else {
       if (code > 0x7f) break;  // Assumption wrong, two-byte string.
       %_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");
+      if (k + 2 >= uriLength) throw MakeURIError();
       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");
+        if (n == 1 || n > 4) throw MakeURIError();
         var octets = new GlobalArray(n);
         octets[0] = cc;
-        if (k + 3 * (n - 1) >= uriLength) throw new $URIError("URI malformed");
+        if (k + 3 * (n - 1) >= uriLength) throw MakeURIError();
         for (var i = 1; i < n; i++) {
-          if (uri.charAt(++k) != '%') throw new $URIError("URI malformed");
+          if (uri.charAt(++k) != '%') throw MakeURIError();
           octets[i] = URIHexCharsToCharCode(uri.charCodeAt(++k),
                                             uri.charCodeAt(++k));
         }
         index = URIDecodeOctets(octets, two_byte, index);
       } else  if (reserved(cc)) {
         %_TwoByteSeqStringSetChar(index++, 37, two_byte);  // '%'.
         %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k - 1), two_byte);
         %_TwoByteSeqStringSetChar(index++, uri.charCodeAt(k), two_byte);
       } else {
         %_TwoByteSeqStringSetChar(index++, cc, two_byte);
@@ skipping 109 matching lines @@
 InstallFunctions(global, DONT_ENUM, [
   "escape", URIEscapeJS,
   "unescape", URIUnescapeJS,
   "decodeURI", URIDecode,
   "decodeURIComponent", URIDecodeComponent,
   "encodeURI", URIEncode,
   "encodeURIComponent", URIEncodeComponent
 ]);
 
 })();