From 27d7dd63774fda32ea0de6bcb6ace3bbfe3dc856 Mon Sep 17 00:00:00 2001 From: Denis Pushkarev Date: Mon, 2 Nov 2015 03:26:06 +0600 Subject: [PATCH] rename `$.unscope` -> `$.add-to-unscopables` --- .../{$.unscope.js => $.add-to-unscopables.js} | 0 library/modules/$.set-species.js | 4 ++-- library/modules/es6.array.copy-within.js | 2 +- library/modules/es6.array.fill.js | 2 +- library/modules/es6.array.find-index.js | 2 +- library/modules/es6.array.find.js | 2 +- library/modules/es6.array.iterator.js | 14 +++++++------- library/modules/es7.array.includes.js | 2 +- modules/{$.unscope.js => $.add-to-unscopables.js} | 0 modules/es6.array.copy-within.js | 2 +- modules/es6.array.fill.js | 2 +- modules/es6.array.find-index.js | 2 +- modules/es6.array.find.js | 2 +- modules/es6.array.iterator.js | 14 +++++++------- modules/es7.array.includes.js | 2 +- .../{$.unscope.js => $.add-to-unscopables.js} | 0 .../library/$.set-species.js | 0 modules/library/$.species.js | 13 ------------- 18 files changed, 26 insertions(+), 39 deletions(-) rename library/modules/{$.unscope.js => $.add-to-unscopables.js} (100%) rename modules/{$.unscope.js => $.add-to-unscopables.js} (100%) rename modules/library/{$.unscope.js => $.add-to-unscopables.js} (100%) rename library/modules/$.species.js => modules/library/$.set-species.js (100%) delete mode 100644 modules/library/$.species.js diff --git a/library/modules/$.unscope.js b/library/modules/$.add-to-unscopables.js similarity index 100% rename from library/modules/$.unscope.js rename to library/modules/$.add-to-unscopables.js diff --git a/library/modules/$.set-species.js b/library/modules/$.set-species.js index ddf0c7496dc7..ac2d0974e032 100644 --- a/library/modules/$.set-species.js +++ b/library/modules/$.set-species.js @@ -1,11 +1,11 @@ 'use strict'; -var global = require('./$.global') +var core = require('./$.core') , $ = require('./$') , DESC = require('./$.support-desc') , SPECIES = require('./$.wks')('species'); module.exports = function(KEY){ - var C = global[KEY]; + var C = core[KEY]; if(DESC && C && !C[SPECIES])$.setDesc(C, SPECIES, { configurable: true, get: function(){ return this; } diff --git a/library/modules/es6.array.copy-within.js b/library/modules/es6.array.copy-within.js index 88b77b011bf5..b008bddc8def 100644 --- a/library/modules/es6.array.copy-within.js +++ b/library/modules/es6.array.copy-within.js @@ -4,4 +4,4 @@ var $def = require('./$.def'); $def($def.P, 'Array', {copyWithin: require('./$.array-copy-within')}); -require('./$.unscope')('copyWithin'); \ No newline at end of file +require('./$.add-to-unscopables')('copyWithin'); \ No newline at end of file diff --git a/library/modules/es6.array.fill.js b/library/modules/es6.array.fill.js index 5a317ef4b9dc..e6b8e8af53a3 100644 --- a/library/modules/es6.array.fill.js +++ b/library/modules/es6.array.fill.js @@ -3,4 +3,4 @@ var $def = require('./$.def'); $def($def.P, 'Array', {fill: require('./$.array-fill')}); -require('./$.unscope')('fill'); \ No newline at end of file +require('./$.add-to-unscopables')('fill'); \ No newline at end of file diff --git a/library/modules/es6.array.find-index.js b/library/modules/es6.array.find-index.js index 7ac6b7fa79d9..da4eff238818 100644 --- a/library/modules/es6.array.find-index.js +++ b/library/modules/es6.array.find-index.js @@ -11,4 +11,4 @@ $def($def.P + $def.F * forced, 'Array', { return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')(KEY); \ No newline at end of file +require('./$.add-to-unscopables')(KEY); \ No newline at end of file diff --git a/library/modules/es6.array.find.js b/library/modules/es6.array.find.js index 3757074b447f..77189fdce80e 100644 --- a/library/modules/es6.array.find.js +++ b/library/modules/es6.array.find.js @@ -11,4 +11,4 @@ $def($def.P + $def.F * forced, 'Array', { return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')(KEY); \ No newline at end of file +require('./$.add-to-unscopables')(KEY); \ No newline at end of file diff --git a/library/modules/es6.array.iterator.js b/library/modules/es6.array.iterator.js index 36bbb2d1866c..52a546dd101a 100644 --- a/library/modules/es6.array.iterator.js +++ b/library/modules/es6.array.iterator.js @@ -1,8 +1,8 @@ 'use strict'; -var setUnscope = require('./$.unscope') - , step = require('./$.iter-step') - , Iterators = require('./$.iterators') - , toIObject = require('./$.to-iobject'); +var addToUnscopables = require('./$.add-to-unscopables') + , step = require('./$.iter-step') + , Iterators = require('./$.iterators') + , toIObject = require('./$.to-iobject'); // 22.1.3.4 Array.prototype.entries() // 22.1.3.13 Array.prototype.keys() @@ -29,6 +29,6 @@ module.exports = require('./$.iter-define')(Array, 'Array', function(iterated, k // argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7) Iterators.Arguments = Iterators.Array; -setUnscope('keys'); -setUnscope('values'); -setUnscope('entries'); \ No newline at end of file +addToUnscopables('keys'); +addToUnscopables('values'); +addToUnscopables('entries'); \ No newline at end of file diff --git a/library/modules/es7.array.includes.js b/library/modules/es7.array.includes.js index 92be2a13bbef..298bdddb6cf1 100644 --- a/library/modules/es7.array.includes.js +++ b/library/modules/es7.array.includes.js @@ -7,4 +7,4 @@ $def($def.P, 'Array', { return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')('includes'); \ No newline at end of file +require('./$.add-to-unscopables')('includes'); \ No newline at end of file diff --git a/modules/$.unscope.js b/modules/$.add-to-unscopables.js similarity index 100% rename from modules/$.unscope.js rename to modules/$.add-to-unscopables.js diff --git a/modules/es6.array.copy-within.js b/modules/es6.array.copy-within.js index 88b77b011bf5..b008bddc8def 100644 --- a/modules/es6.array.copy-within.js +++ b/modules/es6.array.copy-within.js @@ -4,4 +4,4 @@ var $def = require('./$.def'); $def($def.P, 'Array', {copyWithin: require('./$.array-copy-within')}); -require('./$.unscope')('copyWithin'); \ No newline at end of file +require('./$.add-to-unscopables')('copyWithin'); \ No newline at end of file diff --git a/modules/es6.array.fill.js b/modules/es6.array.fill.js index 5a317ef4b9dc..e6b8e8af53a3 100644 --- a/modules/es6.array.fill.js +++ b/modules/es6.array.fill.js @@ -3,4 +3,4 @@ var $def = require('./$.def'); $def($def.P, 'Array', {fill: require('./$.array-fill')}); -require('./$.unscope')('fill'); \ No newline at end of file +require('./$.add-to-unscopables')('fill'); \ No newline at end of file diff --git a/modules/es6.array.find-index.js b/modules/es6.array.find-index.js index 7ac6b7fa79d9..da4eff238818 100644 --- a/modules/es6.array.find-index.js +++ b/modules/es6.array.find-index.js @@ -11,4 +11,4 @@ $def($def.P + $def.F * forced, 'Array', { return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')(KEY); \ No newline at end of file +require('./$.add-to-unscopables')(KEY); \ No newline at end of file diff --git a/modules/es6.array.find.js b/modules/es6.array.find.js index 3757074b447f..77189fdce80e 100644 --- a/modules/es6.array.find.js +++ b/modules/es6.array.find.js @@ -11,4 +11,4 @@ $def($def.P + $def.F * forced, 'Array', { return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')(KEY); \ No newline at end of file +require('./$.add-to-unscopables')(KEY); \ No newline at end of file diff --git a/modules/es6.array.iterator.js b/modules/es6.array.iterator.js index 36bbb2d1866c..52a546dd101a 100644 --- a/modules/es6.array.iterator.js +++ b/modules/es6.array.iterator.js @@ -1,8 +1,8 @@ 'use strict'; -var setUnscope = require('./$.unscope') - , step = require('./$.iter-step') - , Iterators = require('./$.iterators') - , toIObject = require('./$.to-iobject'); +var addToUnscopables = require('./$.add-to-unscopables') + , step = require('./$.iter-step') + , Iterators = require('./$.iterators') + , toIObject = require('./$.to-iobject'); // 22.1.3.4 Array.prototype.entries() // 22.1.3.13 Array.prototype.keys() @@ -29,6 +29,6 @@ module.exports = require('./$.iter-define')(Array, 'Array', function(iterated, k // argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7) Iterators.Arguments = Iterators.Array; -setUnscope('keys'); -setUnscope('values'); -setUnscope('entries'); \ No newline at end of file +addToUnscopables('keys'); +addToUnscopables('values'); +addToUnscopables('entries'); \ No newline at end of file diff --git a/modules/es7.array.includes.js b/modules/es7.array.includes.js index 92be2a13bbef..298bdddb6cf1 100644 --- a/modules/es7.array.includes.js +++ b/modules/es7.array.includes.js @@ -7,4 +7,4 @@ $def($def.P, 'Array', { return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined); } }); -require('./$.unscope')('includes'); \ No newline at end of file +require('./$.add-to-unscopables')('includes'); \ No newline at end of file diff --git a/modules/library/$.unscope.js b/modules/library/$.add-to-unscopables.js similarity index 100% rename from modules/library/$.unscope.js rename to modules/library/$.add-to-unscopables.js diff --git a/library/modules/$.species.js b/modules/library/$.set-species.js similarity index 100% rename from library/modules/$.species.js rename to modules/library/$.set-species.js diff --git a/modules/library/$.species.js b/modules/library/$.species.js deleted file mode 100644 index ac2d0974e032..000000000000 --- a/modules/library/$.species.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; -var core = require('./$.core') - , $ = require('./$') - , DESC = require('./$.support-desc') - , SPECIES = require('./$.wks')('species'); - -module.exports = function(KEY){ - var C = core[KEY]; - if(DESC && C && !C[SPECIES])$.setDesc(C, SPECIES, { - configurable: true, - get: function(){ return this; } - }); -}; \ No newline at end of file