ES6: Add support for Map.prototype.forEach and Set.prototype.forEach

src/collection.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 95 matching lines @@
   }
   return %SetGetSize(this);
 }
 
 
 function SetClear() {
   if (!IS_SET(this)) {
     throw MakeTypeError('incompatible_method_receiver',
                         ['Set.prototype.clear', this]);
   }
-  // Replace the internal table with a new empty table.
-  %SetInitialize(this);
+  %SetClear(this);
 }
 
 
+// Matches OrderedHashTableIterator::Kind enum values.
+var SET_ITERATOR_KIND_VALUES = 2;

[Michael Starzinger, 2014/04/15 16:13:56]

nit: Can we move this constant, together with the comment into macros.py?

[arv (Not doing code reviews), 2014/04/15 17:07:23]

I put ITERATOR_KIND_* in macros and replaced *_ITERATOR_KIND_* with this.

+
+
+function SetForEach(f, receiver) {
+  if (!IS_SET(this)) {
+    throw MakeTypeError('incompatible_method_receiver',
+                        ['Set.prototype.forEach', this]);
+  }
+
+  if (typeof f !== 'function') {

[Michael Starzinger, 2014/04/15 16:13:56]

I think this should use IS_SPEC_FUNCTION for consistency with the rest of the
code. I'll defer to Andreas' comment about this.

[arv (Not doing code reviews), 2014/04/15 17:07:23]

Done.

+    throw MakeTypeError('called_non_callable', [f]);
+  }
+
+  var iterator = %SetCreateIterator(this, SET_ITERATOR_KIND_VALUES);
+  var entry;
+  try {
+    while (!(entry = %SetIteratorNext(iterator)).done) {
+      %_CallFunction(receiver, entry.value, entry.value, this, f);
+    }
+  } finally {
+    %SetIteratorClose(iterator);
+  }
+}
+
+
 // -------------------------------------------------------------------
 
 function SetUpSet() {
   %CheckIsBootstrapping();
 
   %SetCode($Set, SetConstructor);
   %FunctionSetPrototype($Set, new $Object());
   %SetProperty($Set.prototype, "constructor", $Set, DONT_ENUM);
 
+  %FunctionSetLength(SetForEach, 1);
+
   // Set up the non-enumerable functions on the Set prototype object.
   InstallGetter($Set.prototype, "size", SetGetSize);
   InstallFunctions($Set.prototype, DONT_ENUM, $Array(
     "add", SetAdd,
     "has", SetHas,
     "delete", SetDelete,
-    "clear", SetClear
+    "clear", SetClear,
+    "forEach", SetForEach
   ));
 }
 
 SetUpSet();
 
 
 // -------------------------------------------------------------------
 // Harmony Map
 
 function MapConstructor() {
@@ skipping 48 matching lines @@
   }
   return %MapGetSize(this);
 }
 
 
 function MapClear() {
   if (!IS_MAP(this)) {
     throw MakeTypeError('incompatible_method_receiver',
                         ['Map.prototype.clear', this]);
   }
-  // Replace the internal table with a new empty table.
-  %MapInitialize(this);
+  %MapClear(this);
 }
 
 
+// Matches OrderedHashTableIterator::Kind enum values.
+var MAP_ITERATOR_KIND_ENTRIES = 3;

[Michael Starzinger, 2014/04/15 16:13:56]

nit: Likewise.

[arv (Not doing code reviews), 2014/04/15 17:07:23]

Done.

+
+
+function MapForEach(f, receiver) {
+  if (!IS_MAP(this)) {
+    throw MakeTypeError('incompatible_method_receiver',
+                        ['Map.prototype.forEach', this]);
+  }
+
+  if (typeof f !== 'function') {

[Michael Starzinger, 2014/04/15 16:13:56]

Likewise.

[arv (Not doing code reviews), 2014/04/15 17:07:23]

Done.

+    throw MakeTypeError('called_non_callable', [f]);
+  }
+
+  var iterator = %MapCreateIterator(this, MAP_ITERATOR_KIND_ENTRIES);
+  var entry;
+  try {
+    while (!(entry = %MapIteratorNext(iterator)).done) {
+      %_CallFunction(receiver, entry.value[1], entry.value[0], this, f);
+    }
+  } finally {
+    %MapIteratorClose(iterator);
+  }
+}
+
+
 // -------------------------------------------------------------------
 
 function SetUpMap() {
   %CheckIsBootstrapping();
 
   %SetCode($Map, MapConstructor);
   %FunctionSetPrototype($Map, new $Object());
   %SetProperty($Map.prototype, "constructor", $Map, DONT_ENUM);
 
+  %FunctionSetLength(MapForEach, 1);
+
   // Set up the non-enumerable functions on the Map prototype object.
   InstallGetter($Map.prototype, "size", MapGetSize);
   InstallFunctions($Map.prototype, DONT_ENUM, $Array(
     "get", MapGet,
     "set", MapSet,
     "has", MapHas,
     "delete", MapDelete,
-    "clear", MapClear
+    "clear", MapClear,
+    "forEach", MapForEach
   ));
 }
 
 SetUpMap();