Revert of Hook up more import/exports in natives.

src/harmony-typedarray.js

 // Copyright 2014 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.
 
 (function(global, utils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
-// -------------------------------------------------------------------
-// Imports
-
 macro TYPED_ARRAYS(FUNCTION)
 // arrayIds below should be synchronized with Runtime_TypedArrayInitialize.
 FUNCTION(Uint8Array)
 FUNCTION(Int8Array)
 FUNCTION(Uint16Array)
 FUNCTION(Int16Array)
 FUNCTION(Uint32Array)
 FUNCTION(Int32Array)
 FUNCTION(Float32Array)
 FUNCTION(Float64Array)
 FUNCTION(Uint8ClampedArray)
 endmacro
 
 macro DECLARE_GLOBALS(NAME)
 var GlobalNAME = global.NAME;
 endmacro
 
 TYPED_ARRAYS(DECLARE_GLOBALS)
 DECLARE_GLOBALS(Array)
 
-var ArrayFrom;
-var InnerArrayCopyWithin;
-var InnerArrayEvery;
-var InnerArrayFill;
-var InnerArrayFilter;
-var InnerArrayFind;
-var InnerArrayFindIndex;
-var InnerArrayForEach;
-var InnerArrayIndexOf;
-var InnerArrayLastIndexOf;
-var InnerArrayMap;
-var InnerArrayReverse;
-var InnerArraySome;
-var InnerArraySort;
-var IsNaN;
-
-utils.Import(function(from) {
-  ArrayFrom = from.ArrayFrom;
-  InnerArrayCopyWithin = from.InnerArrayCopyWithin;
-  InnerArrayEvery = from.InnerArrayEvery;
-  InnerArrayFill = from.InnerArrayFill;
-  InnerArrayFilter = from.InnerArrayFilter;
-  InnerArrayFind = from.InnerArrayFind;
-  InnerArrayFindIndex = from.InnerArrayFindIndex;
-  InnerArrayForEach = from.InnerArrayForEach;
-  InnerArrayIndexOf = from.InnerArrayIndexOf;
-  InnerArrayLastIndexOf = from.InnerArrayLastIndexOf;
-  InnerArrayMap = from.InnerArrayMap;
-  InnerArrayReverse = from.InnerArrayReverse;
-  InnerArraySome = from.InnerArraySome;
-  InnerArraySort = from.InnerArraySort;
-  IsNaN = from.IsNaN;
-});
-
 // -------------------------------------------------------------------
 
 function ConstructTypedArray(constructor, array) {
   // TODO(littledan): This is an approximation of the spec, which requires
   // that only real TypedArray classes should be accepted (22.2.2.1.1)
   if (!%IsConstructor(constructor) || IS_UNDEFINED(constructor.prototype) ||
       !%HasOwnProperty(constructor.prototype, "BYTES_PER_ELEMENT")) {
     throw MakeTypeError(kNotTypedArray);
   }
 
@@ skipping 10 matching lines @@
   // typedArray.constructor[Symbol.species] (bug v8:4093)
   return ConstructTypedArray(typedArray.constructor, arrayContents);
 }
 
 function TypedArrayCopyWithin(target, start, end) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
   // TODO(littledan): Replace with a memcpy for better performance
-  return InnerArrayCopyWithin(target, start, end, this, length);
+  return $innerArrayCopyWithin(target, start, end, this, length);
 }
 %FunctionSetLength(TypedArrayCopyWithin, 2);
 
 // ES6 draft 05-05-15, section 22.2.3.7
 function TypedArrayEvery(f, receiver) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArrayEvery(f, receiver, this, length);
+  return $innerArrayEvery(f, receiver, this, length);
 }
 %FunctionSetLength(TypedArrayEvery, 1);
 
 // ES6 draft 08-24-14, section 22.2.3.12
 function TypedArrayForEach(f, receiver) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  InnerArrayForEach(f, receiver, this, length);
+  $innerArrayForEach(f, receiver, this, length);
 }
 %FunctionSetLength(TypedArrayForEach, 1);
 
 // ES6 draft 04-05-14 section 22.2.3.8
 function TypedArrayFill(value, start, end) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArrayFill(value, start, end, this, length);
+  return $innerArrayFill(value, start, end, this, length);
 }
 %FunctionSetLength(TypedArrayFill, 1);
 
 // ES6 draft 07-15-13, section 22.2.3.9
 function TypedArrayFilter(predicate, thisArg) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
-  var array = InnerArrayFilter(predicate, thisArg, this, length);
+  var array = $innerArrayFilter(predicate, thisArg, this, length);
   return ConstructTypedArrayLike(this, array);
 }
 %FunctionSetLength(TypedArrayFilter, 1);
 
 // ES6 draft 07-15-13, section 22.2.3.10
 function TypedArrayFind(predicate, thisArg) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArrayFind(predicate, thisArg, this, length);
+  return $innerArrayFind(predicate, thisArg, this, length);
 }
 %FunctionSetLength(TypedArrayFind, 1);
 
 // ES6 draft 07-15-13, section 22.2.3.11
 function TypedArrayFindIndex(predicate, thisArg) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArrayFindIndex(predicate, thisArg, this, length);
+  return $innerArrayFindIndex(predicate, thisArg, this, length);
 }
 %FunctionSetLength(TypedArrayFindIndex, 1);
 
 // ES6 draft 05-18-15, section 22.2.3.21
 function TypedArrayReverse() {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArrayReverse(this, length);
+  return $innerArrayReverse(this, length);
 }
 
 
 function TypedArrayComparefn(x, y) {
-  if (IsNaN(x) && IsNaN(y)) {
-    return IsNaN(y) ? 0 : 1;
+  if ($isNaN(x) && $isNaN(y)) {
+    return $isNaN(y) ? 0 : 1;
   }
-  if (IsNaN(x)) {
+  if ($isNaN(x)) {
     return 1;
   }
   if (x === 0 && x === y) {
     if (%_IsMinusZero(x)) {
       if (!%_IsMinusZero(y)) {
         return -1;
       }
     } else if (%_IsMinusZero(y)) {
       return 1;
     }
   }
   return x - y;
 }
 
 
 // ES6 draft 05-18-15, section 22.2.3.25
 function TypedArraySort(comparefn) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
   if (IS_UNDEFINED(comparefn)) {
     comparefn = TypedArrayComparefn;
   }
 
-  return %_CallFunction(this, length, comparefn, InnerArraySort);
+  return %_CallFunction(this, length, comparefn, $innerArraySort);
 }
 
 
 // ES6 section 22.2.3.13
 function TypedArrayIndexOf(element, index) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return %_CallFunction(this, element, index, length, InnerArrayIndexOf);
+  return %_CallFunction(this, element, index, length, $innerArrayIndexOf);
 }
 %FunctionSetLength(TypedArrayIndexOf, 1);
 
 
 // ES6 section 22.2.3.16
 function TypedArrayLastIndexOf(element, index) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
   return %_CallFunction(this, element, index, length,
-                        %_ArgumentsLength(), InnerArrayLastIndexOf);
+                        %_ArgumentsLength(), $innerArrayLastIndexOf);
 }
 %FunctionSetLength(TypedArrayLastIndexOf, 1);
 
 
 // ES6 draft 07-15-13, section 22.2.3.18
 function TypedArrayMap(predicate, thisArg) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   // TODO(littledan): Preallocate rather than making an intermediate
   // InternalArray, for better performance.
   var length = %_TypedArrayGetLength(this);
-  var array = InnerArrayMap(predicate, thisArg, this, length);
+  var array = $innerArrayMap(predicate, thisArg, this, length);
   return ConstructTypedArrayLike(this, array);
 }
 %FunctionSetLength(TypedArrayMap, 1);
 
 
 // ES6 draft 05-05-15, section 22.2.3.24
 function TypedArraySome(f, receiver) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
-  return InnerArraySome(f, receiver, this, length);
+  return $innerArraySome(f, receiver, this, length);
 }
 %FunctionSetLength(TypedArraySome, 1);
 
 
 // ES6 draft 08-24-14, section 22.2.2.2
 function TypedArrayOf() {
   var length = %_ArgumentsLength();
   var array = new this(length);
   for (var i = 0; i < length; i++) {
     array[i] = %_Arguments(i);
   }
   return array;
 }
 
 
 function TypedArrayFrom(source, mapfn, thisArg) {
   // TODO(littledan): Investigate if there is a receiver which could be
   // faster to accumulate on than Array, e.g., a TypedVector.
-  var array = %_CallFunction(GlobalArray, source, mapfn, thisArg, ArrayFrom);
+  var array = %_CallFunction(GlobalArray, source, mapfn, thisArg, $arrayFrom);
   return ConstructTypedArray(this, array);
 }
 %FunctionSetLength(TypedArrayFrom, 1);
 
 // TODO(littledan): Fix the TypedArray proto chain (bug v8:4085).
 macro EXTEND_TYPED_ARRAY(NAME)
   // Set up non-enumerable functions on the object.
-  utils.InstallFunctions(GlobalNAME, DONT_ENUM | DONT_DELETE | READ_ONLY, [
+  $installFunctions(GlobalNAME, DONT_ENUM | DONT_DELETE | READ_ONLY, [
     "from", TypedArrayFrom,
     "of", TypedArrayOf
   ]);
 
   // Set up non-enumerable functions on the prototype object.
-  utils.InstallFunctions(GlobalNAME.prototype, DONT_ENUM, [
+  $installFunctions(GlobalNAME.prototype, DONT_ENUM, [
     "copyWithin", TypedArrayCopyWithin,
     "every", TypedArrayEvery,
     "fill", TypedArrayFill,
     "filter", TypedArrayFilter,
     "find", TypedArrayFind,
     "findIndex", TypedArrayFindIndex,
     "indexOf", TypedArrayIndexOf,
     "lastIndexOf", TypedArrayLastIndexOf,
     "forEach", TypedArrayForEach,
     "map", TypedArrayMap,
     "reverse", TypedArrayReverse,
     "some", TypedArraySome,
     "sort", TypedArraySort
   ]);
 endmacro
 
 TYPED_ARRAYS(EXTEND_TYPED_ARRAY)
 
 })