make {Map, Set}#forEach non-generic, close #144

zloirock · Dec 15, 2015 · 5d2a566 · 5d2a566
1 parent 575ce3e
commit 5d2a566
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 12 deletions.
diff --git a/library/modules/_collection-strong.js b/library/modules/_collection-strong.js
@@ -65,6 +65,7 @@ module.exports = {
       // 23.2.3.6 Set.prototype.forEach(callbackfn, thisArg = undefined)
       // 23.1.3.5 Map.prototype.forEach(callbackfn, thisArg = undefined)
       forEach: function forEach(callbackfn /*, that = undefined */){
+        anInstance(this, C, 'forEach');
         var f = ctx(callbackfn, arguments.length > 1 ? arguments[1] : undefined, 3)
           , entry;
         while(entry = entry ? entry.n : this._f){

diff --git a/library/modules/_collection.js b/library/modules/_collection.js
@@ -34,6 +34,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
     $.each.call('add,clear,delete,forEach,get,has,set,keys,values,entries'.split(','),function(KEY){
       var IS_ADDER = KEY == 'add' || KEY == 'set';
       if(KEY in proto && !(IS_WEAK && KEY == 'clear'))hide(C.prototype, KEY, function(a, b){
+        anInstance(this, C, KEY);
         if(!IS_ADDER && IS_WEAK && !isObject(a))return KEY == 'get' ? undefined : false;
         var result = this._c[KEY](a === 0 ? 0 : a, b);
         return IS_ADDER ? this : result;

diff --git a/modules/_collection-strong.js b/modules/_collection-strong.js
@@ -65,6 +65,7 @@ module.exports = {
       // 23.2.3.6 Set.prototype.forEach(callbackfn, thisArg = undefined)
       // 23.1.3.5 Map.prototype.forEach(callbackfn, thisArg = undefined)
       forEach: function forEach(callbackfn /*, that = undefined */){
+        anInstance(this, C, 'forEach');
         var f = ctx(callbackfn, arguments.length > 1 ? arguments[1] : undefined, 3)
           , entry;
         while(entry = entry ? entry.n : this._f){

diff --git a/modules/library/_collection.js b/modules/library/_collection.js
@@ -34,6 +34,7 @@ module.exports = function(NAME, wrapper, methods, common, IS_MAP, IS_WEAK){
     $.each.call('add,clear,delete,forEach,get,has,set,keys,values,entries'.split(','),function(KEY){
       var IS_ADDER = KEY == 'add' || KEY == 'set';
       if(KEY in proto && !(IS_WEAK && KEY == 'clear'))hide(C.prototype, KEY, function(a, b){
+        anInstance(this, C, KEY);
         if(!IS_ADDER && IS_WEAK && !isObject(a))return KEY == 'get' ? undefined : false;
         var result = this._c[KEY](a === 0 ? 0 : a, b);
         return IS_ADDER ? this : result;

diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/library.js b/tests/library.js
diff --git a/tests/library/es6.map.ls b/tests/library/es6.map.ls
@@ -2,7 +2,7 @@
 module \ES6
 
 same = (a, b)-> if a is b => a isnt 0 or 1 / a is 1 / b else a !~= a and b !~= b
-{Map, Symbol} = core
+{Map, Set, Symbol} = core
 {getOwnPropertyDescriptor, freeze} = core.Object
 {iterator} = core.Symbol
 
@@ -102,6 +102,7 @@ test 'Map#forEach' (assert)->
     if s isnt '' => throw '!!!'
     s += it
   assert.strictEqual s, \1
+  assert.throws (!-> Map::forEach.call new Set, !->), 'non-generic'
 
 test 'Map#get' (assert)->
   assert.isFunction Map::get

diff --git a/tests/library/es6.set.ls b/tests/library/es6.set.ls
@@ -2,7 +2,7 @@
 module \ES6
 
 same = (a, b)-> if a is b => a isnt 0 or 1 / a is 1 / b else a !~= a and b !~= b
-{Set, Symbol} = core
+{Set, Map, Symbol} = core
 {getOwnPropertyDescriptor, freeze} = core.Object
 {iterator} = core.Symbol
 
@@ -131,6 +131,7 @@ test 'Set#forEach' (assert)->
     if s isnt '' => throw '!!!'
     s += it
   assert.strictEqual s, \0
+  assert.throws (!-> Set::forEach.call new Map, !->), 'non-generic'
 
 test 'Set#has' (assert)->
   assert.isFunction Set::has

diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.map.ls b/tests/tests/es6.map.ls
@@ -135,6 +135,7 @@ test 'Map#forEach' (assert)->
     if s isnt '' => throw '!!!'
     s += it
   assert.strictEqual s, \1
+  assert.throws (!-> Map::forEach.call new Set, !->), 'non-generic'
 
 test 'Map#get' (assert)->
   assert.isFunction Map::get

diff --git a/tests/tests/es6.set.ls b/tests/tests/es6.set.ls
@@ -186,6 +186,7 @@ test 'Set#forEach' (assert)->
     if s isnt '' => throw '!!!'
     s += it
   assert.strictEqual s, \0
+  assert.throws (!-> Set::forEach.call new Map, !->), 'non-generic'
 
 test 'Set#has' (assert)->
   assert.isFunction Set::has