i18n.js was not using original functions

src/i18n.js

 // Copyright 2013 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.
 
 // ECMAScript 402 API implementation.
 
 /**
  * Intl object is a single object that has some named properties,
  * all of which are constructors.
  */
 (function(global, utils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
 // -------------------------------------------------------------------
 // Imports
 
 var GlobalBoolean = global.Boolean;
 var GlobalDate = global.Date;
 var GlobalNumber = global.Number;
 var GlobalRegExp = global.RegExp;
 var GlobalString = global.String;
 var ObjectDefineProperties = utils.ObjectDefineProperties;
 var ObjectDefineProperty = utils.ObjectDefineProperty;
 var SetFunctionName = utils.SetFunctionName;
 
+var ArrayIndexOf;
+var ArrayJoin;
 var IsFinite;
 var IsNaN;
 var MathFloor;
+var RegExpTest;
+var StringIndexOf;
+var StringLastIndexOf;
+var StringMatch;
+var StringReplace;
+var StringSplit;
+var StringSubstr;
+var StringSubstring;
 
 utils.Import(function(from) {
+  ArrayIndexOf = from.ArrayIndexOf;
+  ArrayJoin = from.ArrayJoin;
   IsFinite = from.IsFinite;
   IsNaN = from.IsNaN;
   MathFloor = from.MathFloor;
+  RegExpTest = from.RegExpTest;
+  StringIndexOf = from.StringIndexOf;
+  StringLastIndexOf = from.StringLastIndexOf;
+  StringMatch = from.StringMatch;
+  StringReplace = from.StringReplace;
+  StringSplit = from.StringSplit;
+  StringSubstr = from.StringSubstr;
+  StringSubstring = from.StringSubstring;
 });
 
 // -------------------------------------------------------------------
 
 var Intl = {};
 
 %AddNamedProperty(global, "Intl", Intl, DONT_ENUM);
 
 /**
  * Caches available locales for each service.
@@ skipping 169 matching lines @@
     configurable: true
   });
 }
 
 
 /**
  * Returns an intersection of locales and service supported locales.
  * Parameter locales is treated as a priority list.
  */
 function supportedLocalesOf(service, locales, options) {
-  if (IS_NULL(service.match(GetServiceRE()))) {
+  if (IS_NULL(%_CallFunction(service, GetServiceRE(), StringMatch))) {
     throw MakeError(kWrongServiceType, service);
   }
 
   // Provide defaults if matcher was not specified.
   if (IS_UNDEFINED(options)) {
     options = {};
   } else {
     options = $toObject(options);
   }
 
@@ skipping 27 matching lines @@
 
 /**
  * Returns the subset of the provided BCP 47 language priority list for which
  * this service has a matching locale when using the BCP 47 Lookup algorithm.
  * Locales appear in the same order in the returned list as in the input list.
  */
 function lookupSupportedLocalesOf(requestedLocales, availableLocales) {
   var matchedLocales = [];
   for (var i = 0; i < requestedLocales.length; ++i) {
     // Remove -u- extension.
-    var locale = requestedLocales[i].replace(GetUnicodeExtensionRE(), '');
+    var locale = %_CallFunction(requestedLocales[i], GetUnicodeExtensionRE(),
+                                '', StringReplace);
     do {
       if (!IS_UNDEFINED(availableLocales[locale])) {
         // Push requested locale not the resolved one.
-        matchedLocales.push(requestedLocales[i]);
+        %_CallFunction(matchedLocales, requestedLocales[i], $arrayPush);
         break;
       }
       // Truncate locale if possible, if not break.
-      var pos = locale.lastIndexOf('-');
+      var pos = %_CallFunction(locale, '-', StringLastIndexOf);
       if (pos === -1) {
         break;
       }
-      locale = locale.substring(0, pos);
+      locale = %_CallFunction(locale, 0, pos, StringSubstring);
     } while (true);
   }
 
   return matchedLocales;
 }
 
 
 /**
  * Returns the subset of the provided BCP 47 language priority list for which
  * this service has a matching locale when using the implementation
@@ skipping 23 matching lines @@
           break;
         case 'string':
           value = GlobalString(value);
           break;
         case 'number':
           value = GlobalNumber(value);
           break;
         default:
           throw MakeError(kWrongValueType);
       }
-      if (!IS_UNDEFINED(values) && values.indexOf(value) === -1) {
+
+      if (!IS_UNDEFINED(values) &&
+          %_CallFunction(values, value, ArrayIndexOf) === -1) {
         throw MakeRangeError(kValueOutOfRange, value, caller, property);
       }
 
       return value;
     }
 
     return defaultValue;
   }
 
   return getOption;
@@ skipping 28 matching lines @@
 
   return resolved;
 }
 
 
 /**
  * Returns best matched supported locale and extension info using basic
  * lookup algorithm.
  */
 function lookupMatcher(service, requestedLocales) {
-  if (IS_NULL(service.match(GetServiceRE()))) {
+  if (IS_NULL(%_CallFunction(service, GetServiceRE(), StringMatch))) {
     throw MakeError(kWrongServiceType, service);
   }
 
   // Cache these, they don't ever change per service.
   if (IS_UNDEFINED(AVAILABLE_LOCALES[service])) {
     AVAILABLE_LOCALES[service] = getAvailableLocalesOf(service);
   }
 
   for (var i = 0; i < requestedLocales.length; ++i) {
     // Remove all extensions.
-    var locale = requestedLocales[i].replace(GetAnyExtensionRE(), '');
+    var locale = %_CallFunction(requestedLocales[i], GetAnyExtensionRE(), '',
+                                StringReplace);
     do {
       if (!IS_UNDEFINED(AVAILABLE_LOCALES[service][locale])) {
         // Return the resolved locale and extension.
-        var extensionMatch = requestedLocales[i].match(GetUnicodeExtensionRE());
+        var extensionMatch =
+            %_CallFunction(requestedLocales[i], GetUnicodeExtensionRE(),
+                           StringMatch);
         var extension = IS_NULL(extensionMatch) ? '' : extensionMatch[0];
         return {'locale': locale, 'extension': extension, 'position': i};
       }
       // Truncate locale if possible.
-      var pos = locale.lastIndexOf('-');
+      var pos = %_CallFunction(locale, '-', StringLastIndexOf);
       if (pos === -1) {
         break;
       }
-      locale = locale.substring(0, pos);
+      locale = %_CallFunction(locale, 0, pos, StringSubstring);
     } while (true);
   }
 
   // Didn't find a match, return default.
   if (IS_UNDEFINED(DEFAULT_ICU_LOCALE)) {
     DEFAULT_ICU_LOCALE = %GetDefaultICULocale();
   }
 
   return {'locale': DEFAULT_ICU_LOCALE, 'extension': '', 'position': -1};
 }
 
 
 /**
  * Returns best matched supported locale and extension info using
  * implementation dependend algorithm.
  */
 function bestFitMatcher(service, requestedLocales) {
   // TODO(cira): implement better best fit algorithm.
   return lookupMatcher(service, requestedLocales);
 }
 
 
 /**
  * Parses Unicode extension into key - value map.
  * Returns empty object if the extension string is invalid.
  * We are not concerned with the validity of the values at this point.
  */
 function parseExtension(extension) {
-  var extensionSplit = extension.split('-');
+  var extensionSplit = %_CallFunction(extension, '-', StringSplit);
 
   // Assume ['', 'u', ...] input, but don't throw.
   if (extensionSplit.length <= 2 ||
       (extensionSplit[0] !== '' && extensionSplit[1] !== 'u')) {
     return {};
   }
 
   // Key is {2}alphanum, value is {3,8}alphanum.
   // Some keys may not have explicit values (booleans).
   var extensionMap = {};
@@ skipping 38 matching lines @@
     if (type === 'boolean' && (typeof value === 'string')) {
       value = (value === 'true') ? true : false;
     }
 
     if (!IS_UNDEFINED(property)) {
       defineWEProperty(outOptions, property, value);
     }
   }
 
   for (var key in keyValues) {
-    if (keyValues.hasOwnProperty(key)) {
+    if (%HasOwnProperty(keyValues, key)) {
       var value = UNDEFINED;
       var map = keyValues[key];
       if (!IS_UNDEFINED(map.property)) {
         // This may return true if user specifies numeric: 'false', since
         // Boolean('nonempty') === true.
         value = getOption(map.property, map.type, map.values);
       }
       if (!IS_UNDEFINED(value)) {
         updateProperty(map.property, map.type, value);
         extension += updateExtension(key, value);
         continue;
       }
       // User options didn't have it, check Unicode extension.
       // Here we want to convert strings 'true', 'false' into proper Boolean
       // values (not a user error).
-      if (extensionMap.hasOwnProperty(key)) {
+      if (%HasOwnProperty(extensionMap, key)) {
         value = extensionMap[key];
         if (!IS_UNDEFINED(value)) {
           updateProperty(map.property, map.type, value);
           extension += updateExtension(key, value);
         } else if (map.type === 'boolean') {
           // Boolean keys are allowed not to have values in Unicode extension.
           // Those default to true.
           updateProperty(map.property, map.type, true);
           extension += updateExtension(key, true);
         }
       }
     }
   }
 
   return extension === ''? '' : '-u' + extension;
 }
 
 
 /**
  * Converts all OwnProperties into
  * configurable: false, writable: false, enumerable: true.
  */
 function freezeArray(array) {
-  array.forEach(function(element, index) {
-    ObjectDefineProperty(array, index, {value: element,
-                                        configurable: false,
-                                        writable: false,
-                                        enumerable: true});
-  });
+  var l = array.length;
+  for (var i = 0; i < l; i++) {
+    if (i in array) {
+      ObjectDefineProperty(array, i, {value: array[i],
+                                      configurable: false,
+                                      writable: false,
+                                      enumerable: true});
+    }
+  }
 
-  ObjectDefineProperty(array, 'length', {value: array.length,
-                                         writable: false});
+  ObjectDefineProperty(array, 'length', {value: l, writable: false});
   return array;
 }
 
 
 /**
  * It's sometimes desireable to leave user requested locale instead of ICU
  * supported one (zh-TW is equivalent to zh-Hant-TW, so we should keep shorter
  * one, if that was what user requested).
  * This function returns user specified tag if its maximized form matches ICU
  * resolved locale. If not we return ICU result.
  */
 function getOptimalLanguageTag(original, resolved) {
   // Returns Array<Object>, where each object has maximized and base properties.
   // Maximized: zh -> zh-Hans-CN
   // Base: zh-CN-u-ca-gregory -> zh-CN
   // Take care of grandfathered or simple cases.
   if (original === resolved) {
     return original;
   }
 
   var locales = %GetLanguageTagVariants([original, resolved]);
   if (locales[0].maximized !== locales[1].maximized) {
     return resolved;
   }
 
   // Preserve extensions of resolved locale, but swap base tags with original.
   var resolvedBase = new GlobalRegExp('^' + locales[1].base);
-  return resolved.replace(resolvedBase, locales[0].base);
+  return %_CallFunction(resolved, resolvedBase, locales[0].base, StringReplace);
 }
 
 
 /**
  * Returns an Object that contains all of supported locales for a given
  * service.
  * In addition to the supported locales we add xx-ZZ locale for each xx-Yyyy-ZZ
  * that is supported. This is required by the spec.
  */
 function getAvailableLocalesOf(service) {
   var available = %AvailableLocalesOf(service);
 
   for (var i in available) {
-    if (available.hasOwnProperty(i)) {
-      var parts = i.match(/^([a-z]{2,3})-([A-Z][a-z]{3})-([A-Z]{2})$/);
+    if (%HasOwnProperty(available, i)) {
+      var parts = %_CallFunction(i, /^([a-z]{2,3})-([A-Z][a-z]{3})-([A-Z]{2})$/,
+                                 StringMatch);
       if (parts !== null) {
         // Build xx-ZZ. We don't care about the actual value,
         // as long it's not undefined.
         available[parts[1] + '-' + parts[3]] = null;
       }
     }
   }
 
   return available;
 }
@@ skipping 39 matching lines @@
   if (!IS_UNDEFINED(value)) {
     defineWECProperty(object, property, value);
   }
 }
 
 
 /**
  * Returns titlecased word, aMeRricA -> America.
  */
 function toTitleCaseWord(word) {
-  return word.substr(0, 1).toUpperCase() + word.substr(1).toLowerCase();
+  return %StringToUpperCase(%_CallFunction(word, 0, 1, StringSubstr)) +
+         %StringToLowerCase(%_CallFunction(word, 1, StringSubstr));
 }
 
 /**
  * Canonicalizes the language tag, or throws in case the tag is invalid.
  */
 function canonicalizeLanguageTag(localeID) {
   // null is typeof 'object' so we have to do extra check.
   if (typeof localeID !== 'string' && typeof localeID !== 'object' ||
       IS_NULL(localeID)) {
     throw MakeTypeError(kLanguageID);
@@ skipping 23 matching lines @@
  * Throws on locales that are not well formed BCP47 tags.
  */
 function initializeLocaleList(locales) {
   var seen = [];
   if (IS_UNDEFINED(locales)) {
     // Constructor is called without arguments.
     seen = [];
   } else {
     // We allow single string localeID.
     if (typeof locales === 'string') {
-      seen.push(canonicalizeLanguageTag(locales));
+      %_CallFunction(seen, canonicalizeLanguageTag(locales), $arrayPush);
       return freezeArray(seen);
     }
 
     var o = $toObject(locales);
-    // Converts it to UInt32 (>>> is shr on 32bit integers).
-    var len = o.length >>> 0;
+    var len = TO_UINT32(o.length);
 
     for (var k = 0; k < len; k++) {
       if (k in o) {
         var value = o[k];
 
         var tag = canonicalizeLanguageTag(value);
 
-        if (seen.indexOf(tag) === -1) {
-          seen.push(tag);
+        if (%_CallFunction(seen, tag, ArrayIndexOf) === -1) {
+          %_CallFunction(seen, tag, $arrayPush);
         }
       }
     }
   }
 
   return freezeArray(seen);
 }
 
 
 /**
  * Validates the language tag. Section 2.2.9 of the bcp47 spec
  * defines a valid tag.
  *
  * ICU is too permissible and lets invalid tags, like
  * hant-cmn-cn, through.
  *
  * Returns false if the language tag is invalid.
  */
 function isValidLanguageTag(locale) {
   // Check if it's well-formed, including grandfadered tags.
-  if (GetLanguageTagRE().test(locale) === false) {
+  if (!%_CallFunction(GetLanguageTagRE(), locale, RegExpTest)) {
     return false;
   }
 
   // Just return if it's a x- form. It's all private.
-  if (locale.indexOf('x-') === 0) {
+  if (%_CallFunction(locale, 'x-', StringIndexOf) === 0) {
     return true;
   }
 
   // Check if there are any duplicate variants or singletons (extensions).
 
   // Remove private use section.
-  locale = locale.split(/-x-/)[0];
+  locale = %_CallFunction(locale, /-x-/, StringSplit)[0];
 
   // Skip language since it can match variant regex, so we start from 1.
   // We are matching i-klingon here, but that's ok, since i-klingon-klingon
   // is not valid and would fail LANGUAGE_TAG_RE test.
   var variants = [];
   var extensions = [];
-  var parts = locale.split(/-/);
+  var parts = %_CallFunction(locale, /-/, StringSplit);
   for (var i = 1; i < parts.length; i++) {
     var value = parts[i];
-    if (GetLanguageVariantRE().test(value) === true && extensions.length === 0) {
-      if (variants.indexOf(value) === -1) {
-        variants.push(value);
+    if (%_CallFunction(GetLanguageVariantRE(), value, RegExpTest) &&
+        extensions.length === 0) {
+      if (%_CallFunction(variants, value, ArrayIndexOf) === -1) {
+        %_CallFunction(variants, value, $arrayPush);
       } else {
         return false;
       }
     }
 
-    if (GetLanguageSingletonRE().test(value) === true) {
-      if (extensions.indexOf(value) === -1) {
-        extensions.push(value);
+    if (%_CallFunction(GetLanguageSingletonRE(), value, RegExpTest)) {
+      if (%_CallFunction(extensions, value, ArrayIndexOf) === -1) {
+        %_CallFunction(extensions, value, $arrayPush);
       } else {
         return false;
       }
     }
   }
 
   return true;
  }
 
 
@@ skipping 82 matching lines @@
     'kn': {'property': 'numeric', 'type': 'boolean'},
     'kf': {'property': 'caseFirst', 'type': 'string',
            'values': ['false', 'lower', 'upper']}
   };
 
   setOptions(
       options, extensionMap, COLLATOR_KEY_MAP, getOption, internalOptions);
 
   var collation = 'default';
   var extension = '';
-  if (extensionMap.hasOwnProperty('co') && internalOptions.usage === 'sort') {
+  if (%HasOwnProperty(extensionMap, 'co') && internalOptions.usage === 'sort') {
 
     /**
      * Allowed -u-co- values. List taken from:
      * http://unicode.org/repos/cldr/trunk/common/bcp47/collation.xml
      */
     var ALLOWED_CO_VALUES = [
       'big5han', 'dict', 'direct', 'ducet', 'gb2312', 'phonebk', 'phonetic',
       'pinyin', 'reformed', 'searchjl', 'stroke', 'trad', 'unihan', 'zhuyin'
     ];
 
-    if (ALLOWED_CO_VALUES.indexOf(extensionMap.co) !== -1) {
+    if (%_CallFunction(ALLOWED_CO_VALUES, extensionMap.co, ArrayIndexOf) !==
+        -1) {
       extension = '-u-co-' + extensionMap.co;
       // ICU can't tell us what the collation is, so save user's input.
       collation = extensionMap.co;
     }
   } else if (internalOptions.usage === 'search') {
     extension = '-u-co-search';
   }
   defineWEProperty(internalOptions, 'collation', collation);
 
   var requestedLocale = locale.locale + extension;
@@ skipping 119 matching lines @@
 addBoundMethod(Intl.Collator, 'compare', compare, 2);
 
 /**
  * Verifies that the input is a well-formed ISO 4217 currency code.
  * Don't uppercase to test. It could convert invalid code into a valid one.
  * For example \u00DFP (Eszett+P) becomes SSP.
  */
 function isWellFormedCurrencyCode(currency) {
   return typeof currency == "string" &&
       currency.length == 3 &&
-      currency.match(/[^A-Za-z]/) == null;
+      %_CallFunction(currency, /[^A-Za-z]/, StringMatch) == null;
 }
 
 
 /**
  * Returns the valid digit count for a property, or throws RangeError on
  * a value out of the range.
  */
 function getNumberOption(options, property, min, max, fallback) {
   var value = options[property];
   if (!IS_UNDEFINED(value)) {
@@ skipping 34 matching lines @@
     throw MakeRangeError(kInvalidCurrencyCode, currency);
   }
 
   if (internalOptions.style === 'currency' && IS_UNDEFINED(currency)) {
     throw MakeTypeError(kCurrencyCode);
   }
 
   var currencyDisplay = getOption(
       'currencyDisplay', 'string', ['code', 'symbol', 'name'], 'symbol');
   if (internalOptions.style === 'currency') {
-    defineWEProperty(internalOptions, 'currency', currency.toUpperCase());
+    defineWEProperty(internalOptions, 'currency', %StringToUpperCase(currency));
     defineWEProperty(internalOptions, 'currencyDisplay', currencyDisplay);
   }
 
   // Digit ranges.
   var mnid = getNumberOption(options, 'minimumIntegerDigits', 1, 21, 1);
   defineWEProperty(internalOptions, 'minimumIntegerDigits', mnid);
 
   var mnfd = getNumberOption(options, 'minimumFractionDigits', 0, 20, 0);
   defineWEProperty(internalOptions, 'minimumFractionDigits', mnfd);
 
@@ skipping 35 matching lines @@
     currencyDisplay: {writable: true},
     locale: {writable: true},
     maximumFractionDigits: {writable: true},
     minimumFractionDigits: {writable: true},
     minimumIntegerDigits: {writable: true},
     numberingSystem: {writable: true},
     requestedLocale: {value: requestedLocale, writable: true},
     style: {value: internalOptions.style, writable: true},
     useGrouping: {writable: true}
   });
-  if (internalOptions.hasOwnProperty('minimumSignificantDigits')) {
+  if (%HasOwnProperty(internalOptions, 'minimumSignificantDigits')) {
     defineWEProperty(resolved, 'minimumSignificantDigits', UNDEFINED);
   }
-  if (internalOptions.hasOwnProperty('maximumSignificantDigits')) {
+  if (%HasOwnProperty(internalOptions, 'maximumSignificantDigits')) {
     defineWEProperty(resolved, 'maximumSignificantDigits', UNDEFINED);
   }
   var formatter = %CreateNumberFormat(requestedLocale,
                                       internalOptions,
                                       resolved);
 
   // We can't get information about number or currency style from ICU, so we
   // assume user request was fulfilled.
   if (internalOptions.style === 'currency') {
     ObjectDefineProperty(resolved, 'currencyDisplay', {value: currencyDisplay,
@@ skipping 53 matching lines @@
       minimumFractionDigits: format.resolved.minimumFractionDigits,
       maximumFractionDigits: format.resolved.maximumFractionDigits,
     };
 
     if (result.style === 'currency') {
       defineWECProperty(result, 'currency', format.resolved.currency);
       defineWECProperty(result, 'currencyDisplay',
                         format.resolved.currencyDisplay);
     }
 
-    if (format.resolved.hasOwnProperty('minimumSignificantDigits')) {
+    if (%HasOwnProperty(format.resolved, 'minimumSignificantDigits')) {
       defineWECProperty(result, 'minimumSignificantDigits',
                         format.resolved.minimumSignificantDigits);
     }
 
-    if (format.resolved.hasOwnProperty('maximumSignificantDigits')) {
+    if (%HasOwnProperty(format.resolved, 'maximumSignificantDigits')) {
       defineWECProperty(result, 'maximumSignificantDigits',
                         format.resolved.maximumSignificantDigits);
     }
 
     return result;
   },
   DONT_ENUM
 );
 SetFunctionName(Intl.NumberFormat.prototype.resolvedOptions, 'resolvedOptions');
 %FunctionRemovePrototype(Intl.NumberFormat.prototype.resolvedOptions);
@@ skipping 107 matching lines @@
     return '';
   }
 }
 
 
 /**
  * Returns object that matches LDML representation of the date.
  */
 function fromLDMLString(ldmlString) {
   // First remove '' quoted text, so we lose 'Uhr' strings.
-  ldmlString = ldmlString.replace(GetQuotedStringRE(), '');
+  ldmlString = %_CallFunction(ldmlString, GetQuotedStringRE(), '',
+                              StringReplace);
 
   var options = {};
-  var match = ldmlString.match(/E{3,5}/g);
+  var match = %_CallFunction(ldmlString, /E{3,5}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'weekday', match, {EEEEE: 'narrow', EEE: 'short', EEEE: 'long'});
 
-  match = ldmlString.match(/G{3,5}/g);
+  match = %_CallFunction(ldmlString, /G{3,5}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'era', match, {GGGGG: 'narrow', GGG: 'short', GGGG: 'long'});
 
-  match = ldmlString.match(/y{1,2}/g);
+  match = %_CallFunction(ldmlString, /y{1,2}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'year', match, {y: 'numeric', yy: '2-digit'});
 
-  match = ldmlString.match(/M{1,5}/g);
+  match = %_CallFunction(ldmlString, /M{1,5}/g, StringMatch);
   options = appendToDateTimeObject(options, 'month', match, {MM: '2-digit',
       M: 'numeric', MMMMM: 'narrow', MMM: 'short', MMMM: 'long'});
 
   // Sometimes we get L instead of M for month - standalone name.
-  match = ldmlString.match(/L{1,5}/g);
+  match = %_CallFunction(ldmlString, /L{1,5}/g, StringMatch);
   options = appendToDateTimeObject(options, 'month', match, {LL: '2-digit',
       L: 'numeric', LLLLL: 'narrow', LLL: 'short', LLLL: 'long'});
 
-  match = ldmlString.match(/d{1,2}/g);
+  match = %_CallFunction(ldmlString, /d{1,2}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'day', match, {d: 'numeric', dd: '2-digit'});
 
-  match = ldmlString.match(/h{1,2}/g);
+  match = %_CallFunction(ldmlString, /h{1,2}/g, StringMatch);
   if (match !== null) {
     options['hour12'] = true;
   }
   options = appendToDateTimeObject(
       options, 'hour', match, {h: 'numeric', hh: '2-digit'});
 
-  match = ldmlString.match(/H{1,2}/g);
+  match = %_CallFunction(ldmlString, /H{1,2}/g, StringMatch);
   if (match !== null) {
     options['hour12'] = false;
   }
   options = appendToDateTimeObject(
       options, 'hour', match, {H: 'numeric', HH: '2-digit'});
 
-  match = ldmlString.match(/m{1,2}/g);
+  match = %_CallFunction(ldmlString, /m{1,2}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'minute', match, {m: 'numeric', mm: '2-digit'});
 
-  match = ldmlString.match(/s{1,2}/g);
+  match = %_CallFunction(ldmlString, /s{1,2}/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'second', match, {s: 'numeric', ss: '2-digit'});
 
-  match = ldmlString.match(/z|zzzz/g);
+  match = %_CallFunction(ldmlString, /z|zzzz/g, StringMatch);
   options = appendToDateTimeObject(
       options, 'timeZoneName', match, {z: 'short', zzzz: 'long'});
 
   return options;
 }
 
 
 function appendToDateTimeObject(options, option, match, pairs) {
   if (IS_NULL(match)) {
-    if (!options.hasOwnProperty(option)) {
+    if (!%HasOwnProperty(options, option)) {
       defineWEProperty(options, option, UNDEFINED);
     }
     return options;
   }
 
   var property = match[0];
   defineWEProperty(options, option, pairs[property]);
 
   return options;
 }
@@ skipping 254 matching lines @@
 
 
 /**
  * Returns a String value representing the result of calling ToNumber(date)
  * according to the effective locale and the formatting options of this
  * DateTimeFormat.
  */
 function formatDate(formatter, dateValue) {
   var dateMs;
   if (IS_UNDEFINED(dateValue)) {
-    dateMs = GlobalDate.now();
+    dateMs = %DateCurrentTime();
   } else {
     dateMs = $toNumber(dateValue);
   }
 
   if (!IsFinite(dateMs)) throw MakeRangeError(kDateRange);
 
   return %InternalDateFormat(%GetImplFromInitializedIntlObject(formatter),
                              new GlobalDate(dateMs));
 }
 
@@ skipping 19 matching lines @@
  * Returns canonical Area/Location name, or throws an exception if the zone
  * name is invalid IANA name.
  */
 function canonicalizeTimeZoneID(tzID) {
   // Skip undefined zones.
   if (IS_UNDEFINED(tzID)) {
     return tzID;
   }
 
   // Special case handling (UTC, GMT).
-  var upperID = tzID.toUpperCase();
+  var upperID = %StringToUpperCase(tzID);
   if (upperID === 'UTC' || upperID === 'GMT' ||
       upperID === 'ETC/UTC' || upperID === 'ETC/GMT') {
     return 'UTC';
   }
 
   // We expect only _ and / beside ASCII letters.
   // All inputs should conform to Area/Location from now on.
-  var match = GetTimezoneNameCheckRE().exec(tzID);
+  var match = %_CallFunction(tzID, GetTimezoneNameCheckRE(), StringMatch);
   if (IS_NULL(match)) throw MakeRangeError(kExpectedLocation, tzID);
 
   var result = toTitleCaseWord(match[1]) + '/' + toTitleCaseWord(match[2]);
   var i = 3;
   while (!IS_UNDEFINED(match[i]) && i < match.length) {
     result = result + '_' + toTitleCaseWord(match[i]);
     i++;
   }
 
   return result;
@@ skipping 238 matching lines @@
     if (%_IsConstructCall()) {
       throw MakeTypeError(kOrdinaryFunctionCalledAsConstructor);
     }
 
     CHECK_OBJECT_COERCIBLE(this, "String.prototype.normalize");
 
     var form = GlobalString(%_Arguments(0) || 'NFC');
 
     var NORMALIZATION_FORMS = ['NFC', 'NFD', 'NFKC', 'NFKD'];
 
-    var normalizationForm = NORMALIZATION_FORMS.indexOf(form);
+    var normalizationForm =
+        %_CallFunction(NORMALIZATION_FORMS, form, ArrayIndexOf);
     if (normalizationForm === -1) {
-      throw MakeRangeError(kNormalizationForm, NORMALIZATION_FORMS.join(', '));
+      throw MakeRangeError(kNormalizationForm,
+          %_CallFunction(NORMALIZATION_FORMS, ', ', ArrayJoin));
     }
 
     return %StringNormalize(this, normalizationForm);
   }
 );
 
 
 /**
  * Formats a Number object (this) using locale and options values.
  * If locale or options are omitted, defaults are used.
@@ skipping 81 matching lines @@
     }
 
     var locales = %_Arguments(0);
     var options = %_Arguments(1);
     return toLocaleDateTime(
         this, locales, options, 'time', 'time', 'dateformattime');
   }
 );
 
 })