lib: replace Symbol.iterator by SymbolIterator

Sebastien-Ahkrin · targos · commit 22df5dc95633 · 2020-01-14T10:55:36.000+01:00
PR-URL: #30859 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/streams/buffer_list.js b/lib/internal/streams/buffer_list.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const {
- Symbol,
+ SymbolIterator,
 } = primordials;
 
 const { Buffer } = require('buffer');
@@ -94,7 +94,7 @@ module.exports = class BufferList {
 return this.head.data;
 }
 
- *[Symbol.iterator]() {
+ *[SymbolIterator]() {
 for (let p = this.head; p; p = p.next) {
 yield p.data;
 }
diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js
@@ -2,6 +2,7 @@
 
 const {
 Symbol,
+ SymbolIterator
 } = primordials;
 
 const {
@@ -12,8 +13,8 @@ function from(Readable, iterable, opts) {
 let iterator;
 if (iterable && iterable[Symbol.asyncIterator])
 iterator = iterable[Symbol.asyncIterator]();
- else if (iterable && iterable[Symbol.iterator])
- iterator = iterable[Symbol.iterator]();
+ else if (iterable && iterable[SymbolIterator])
+ iterator = iterable[SymbolIterator]();
 else
 throw new ERR_INVALID_ARG_TYPE('iterable', ['Iterable'], iterable);
 
diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -12,6 +12,7 @@ const {
 ReflectGetOwnPropertyDescriptor,
 ReflectOwnKeys,
 Symbol,
+ SymbolIterator,
 } = primordials;
 
 const { inspect } = require('internal/util/inspect');
@@ -87,7 +88,7 @@ const kFormat = Symbol('format');
 
 // https://tc39.github.io/ecma262/#sec-%iteratorprototype%-object
 const IteratorPrototype = ObjectGetPrototypeOf(
- ObjectGetPrototypeOf([][Symbol.iterator]())
+ ObjectGetPrototypeOf([][SymbolIterator]())
 );
 
 const unpairedSurrogateRe =
@@ -139,8 +140,8 @@ class URLSearchParams {
 if (init === null || init === undefined) {
 this[searchParams] = [];
 } else if (typeof init === 'object' || typeof init === 'function') {
- const method = init[Symbol.iterator];
- if (method === this[Symbol.iterator]) {
+ const method = init[SymbolIterator];
+ if (method === this[SymbolIterator]) {
 // While the spec does not have this branch, we can use it as a
 // shortcut to avoid having to go through the costly generic iterator.
 const childParams = init[searchParams];
@@ -156,7 +157,7 @@ class URLSearchParams {
 for (const pair of init) {
 if ((typeof pair !== 'object' && typeof pair !== 'function') ||
 pair === null ||
- typeof pair[Symbol.iterator] !== 'function') {
+ typeof pair[SymbolIterator] !== 'function') {
 throw new ERR_INVALID_TUPLE('Each query pair', '[name, value]');
 }
 const convertedPair = [];
@@ -1149,7 +1150,7 @@ defineIDLClass(URLSearchParams.prototype, 'URLSearchParams', {
 });
 
 // https://heycam.github.io/webidl/#es-iterable-entries
-ObjectDefineProperty(URLSearchParams.prototype, Symbol.iterator, {
+ObjectDefineProperty(URLSearchParams.prototype, SymbolIterator, {
 writable: true,
 configurable: true,
 value: URLSearchParams.prototype.entries

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`	`3`	`const{`
`4`		`-Symbol,`
	`4`	`+SymbolIterator,`
`5`	`5`	`}=primordials;`
`6`	`6`
`7`	`7`	`const{ Buffer }=require('buffer');`
`@@ -94,7 +94,7 @@ module.exports = class BufferList {`
`94`	`94`	`returnthis.head.data;`
`95`	`95`	`}`
`96`	`96`
`97`		`-*[Symbol.iterator](){`
	`97`	`+*[SymbolIterator](){`
`98`	`98`	`for(letp=this.head;p;p=p.next){`
`99`	`99`	`yieldp.data;`
`100`	`100`	`}`
-Original file line number
+Diff line change
 const{
  Symbol,
 + SymbolIterator
 }=primordials;
 const{
 letiterator;
 if(iterable&&iterable[Symbol.asyncIterator])
 iterator=iterable[Symbol.asyncIterator]();
 -elseif(iterable&&iterable[Symbol.iterator])
 -iterator=iterable[Symbol.iterator]();
 +elseif(iterable&&iterable[SymbolIterator])
 +iterator=iterable[SymbolIterator]();
 else
 thrownewERR_INVALID_ARG_TYPE('iterable',['Iterable'],iterable);
-Original file line number
+Diff line change
  ReflectGetOwnPropertyDescriptor,
  ReflectOwnKeys,
  Symbol,
 + SymbolIterator,
 }=primordials;
 const{ inspect }=require('internal/util/inspect');
 // https://tc39.github.io/ecma262/#sec-%iteratorprototype%-object
 constIteratorPrototype=ObjectGetPrototypeOf(
 -ObjectGetPrototypeOf([][Symbol.iterator]())
 +ObjectGetPrototypeOf([][SymbolIterator]())
 );
 constunpairedSurrogateRe=
 if(init===null||init===undefined){
 this[searchParams]=[];
 }elseif(typeofinit==='object'||typeofinit==='function'){
 -constmethod=init[Symbol.iterator];
 -if(method===this[Symbol.iterator]){
 +constmethod=init[SymbolIterator];
 +if(method===this[SymbolIterator]){
 // While the spec does not have this branch, we can use it as a
 // shortcut to avoid having to go through the costly generic iterator.
 constchildParams=init[searchParams];
 for(constpairofinit){
 if((typeofpair!=='object'&&typeofpair!=='function')||
 pair===null||
 -typeofpair[Symbol.iterator]!=='function'){
 +typeofpair[SymbolIterator]!=='function'){
 thrownewERR_INVALID_TUPLE('Each query pair','[name, value]');
+}
 constconvertedPair=[];
 });
 // https://heycam.github.io/webidl/#es-iterable-entries
 -ObjectDefineProperty(URLSearchParams.prototype,Symbol.iterator,{
 +ObjectDefineProperty(URLSearchParams.prototype,SymbolIterator,{
 writable: true,
 configurable: true,
 value: URLSearchParams.prototype.entries