Re-land %TypedArray%.prototype.{map,filter,some}

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, exports) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
@@ skipping 12 matching lines @@
 
 macro DECLARE_GLOBALS(NAME)
 var GlobalNAME = global.NAME;
 endmacro
 
 TYPED_ARRAYS(DECLARE_GLOBALS)
 DECLARE_GLOBALS(Array)
 
 // -------------------------------------------------------------------
 
+function ConstructTypedArray(constructor, array) {

[adamk, 2015/05/20 18:50:07]

Where is this called?

[arv (Not doing code reviews), 2015/05/20 19:22:31]

Also, this function is defined twice... was there a merge?

[dehrenberg, 2015/05/20 23:39:01]

Yes. OK, I learned my lesson, not to do git conflict resolution late at night.
It was intended to be called in ConstructTypedArrayLike, but apparently I forgot
to call it there (a bug that goes back to the first time I tried to land this
code). Before you ask: it'd be hard to test this code directly until @@species
goes in; I have a test in TypedArray.from, but no test that TypedArray.map
reaches this code.

+  // 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 (!IS_SPEC_OBJECT(constructor) || IS_UNDEFINED(constructor.prototype) ||

[adamk, 2015/05/20 18:50:07]

Can you use %IsConstructor here? These checks look quite odd. (if this function
is unused, you can of course ignore this comment)

[dehrenberg, 2015/05/20 23:39:01]

The check is supposed to be an approximation of checking that this is a
TypedArray class. I replaced IS_SPEC_OBJECT with %IsConstructor, but I still
need the next couple checks.

+      !%HasOwnProperty(constructor.prototype, "BYTES_PER_ELEMENT")) {
+    throw MakeTypeError(kNotTypedArray);
+  }
+
+  // TODO(littledan): The spec requires that, rather than directly calling
+  // the constructor, a TypedArray is created with the proper proto and
+  // underlying size and element size, and elements are put in one by one.
+  // By contrast, this would allow subclasses to make a radically different
+  // constructor with different semantics.
+  return new constructor(array);
+}
+
+function ConstructTypedArrayLike(typedArray, arrayContents) {
+  // TODO(littledan): The spec requires that we actuallly use
+  // typedArray.constructor[Symbol.species] (bug v8:4093)
+  return new 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);
 }
 %FunctionSetLength(TypedArrayCopyWithin, 2);
 
@@ skipping 11 matching lines @@
 function TypedArrayForEach(f, receiver) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
   $innerArrayForEach(f, receiver, this, length);
 }
 %FunctionSetLength(TypedArrayForEach, 1);
 
 // ES6 draft 04-05-14 section 22.2.3.8
-function TypedArrayFill(value, start , end) {
+function TypedArrayFill(value, start, end) {
   if (!%IsTypedArray(this)) throw MakeTypeError(kNotTypedArray);
 
   var length = %_TypedArrayGetLength(this);
 
   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);
+  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);
 }
 %FunctionSetLength(TypedArrayFind, 1);
 
@@ skipping 64 matching lines @@
 
 // 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);
 }
-%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
+  // array, for better performance.
+  var length = %_TypedArrayGetLength(this);
+  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);
+}
+%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;
@@ skipping 28 matching lines @@
   // Set up non-enumerable functions on the object.
   $installFunctions(GlobalNAME, DONT_ENUM | DONT_DELETE | READ_ONLY, [
     "from", TypedArrayFrom,
     "of", TypedArrayOf
   ]);
 
   // Set up non-enumerable functions on the prototype object.
   $installFunctions(GlobalNAME.prototype, DONT_ENUM, [
     "copyWithin", TypedArrayCopyWithin,
     "every", TypedArrayEvery,
-    "forEach", TypedArrayForEach,
+    "fill", TypedArrayFill,
+    "filter", TypedArrayFilter,
     "find", TypedArrayFind,
     "findIndex", TypedArrayFindIndex,
     "fill", TypedArrayFill,

[adamk, 2015/05/20 18:50:07]

This is a dup of the sorted line above.

[dehrenberg, 2015/05/20 23:39:01]

Done.

     "indexOf", TypedArrayIndexOf,
     "lastIndexOf", TypedArrayLastIndexOf,
+    "forEach", TypedArrayForEach,
+    "map", TypedArrayMap,
     "reverse", TypedArrayReverse,
+    "some", TypedArraySome
     "sort", TypedArraySort
   ]);
 endmacro
 
 TYPED_ARRAYS(EXTEND_TYPED_ARRAY)
 
 })