From 33028d5199e8d619ca76d519518bc911c60ca2fa Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Thu, 9 Apr 2015 14:06:57 -0700 Subject: [PATCH] Replace uses of 'Symbol.isRegExp' with 'Symbol.toPrimitive'. --- src/lib/es6.d.ts | 10 +++++----- .../conformance/es6/Symbols/symbolDeclarationEmit1.ts | 2 +- .../conformance/es6/Symbols/symbolDeclarationEmit11.ts | 4 ++-- .../conformance/es6/Symbols/symbolDeclarationEmit12.ts | 4 ++-- .../conformance/es6/Symbols/symbolDeclarationEmit13.ts | 2 +- .../conformance/es6/Symbols/symbolDeclarationEmit14.ts | 2 +- .../conformance/es6/Symbols/symbolDeclarationEmit2.ts | 2 +- .../conformance/es6/Symbols/symbolDeclarationEmit3.ts | 6 +++--- .../conformance/es6/Symbols/symbolDeclarationEmit4.ts | 4 ++-- .../cases/conformance/es6/Symbols/symbolProperty21.ts | 2 +- tests/cases/conformance/es6/Symbols/symbolProperty5.ts | 2 +- tests/cases/conformance/es6/Symbols/symbolProperty6.ts | 2 +- tests/cases/conformance/es6/Symbols/symbolProperty8.ts | 2 +- .../ecmascript6/Symbols/parserSymbolProperty4.ts | 2 +- .../ecmascript6/Symbols/parserSymbolProperty5.ts | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts index 2af11c92ab9..b81a3341a6c 100644 --- a/src/lib/es6.d.ts +++ b/src/lib/es6.d.ts @@ -52,19 +52,19 @@ interface SymbolConstructor { /** * A method that returns the default iterator for an object.Called by the semantics of the - * for-of statement. + * for-of statement. */ iterator: symbol; /** * A method that converts an object to a corresponding primitive value.Called by the ToPrimitive - * abstract operation. + * abstract operation. */ toPrimitive: symbol; /** - * A String value that is used in the creation of the default string description of an object. - * Called by the built- in method Object.prototype.toString. + * A String value that is used in the creation of the default string description of an object. + * Called by the built-in method Object.prototype.toString. */ toStringTag: symbol; @@ -106,7 +106,7 @@ interface ObjectConstructor { getOwnPropertySymbols(o: any): symbol[]; /** - * Returns true if the values are the same value, false otherwise. + * Returns true if the values are the same value, false otherwise. * @param value1 The first value. * @param value2 The second value. */ diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit1.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit1.ts index b99806a1eee..1f4755e5203 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit1.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit1.ts @@ -1,5 +1,5 @@ //@target: ES6 //@declaration: true class C { - [Symbol.isRegExp]: number; + [Symbol.toPrimitive]: number; } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit11.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit11.ts index 4b88ab55980..26868e60d00 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit11.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit11.ts @@ -3,6 +3,6 @@ class C { static [Symbol.iterator] = 0; static [Symbol.toPrimitive]() { } - static get [Symbol.isRegExp]() { return ""; } - static set [Symbol.isRegExp](x) { } + static get [Symbol.toPrimitive]() { return ""; } + static set [Symbol.toPrimitive](x) { } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts index c18b470d35d..8422b1ec016 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts @@ -8,7 +8,7 @@ module M { [Symbol.isConcatSpreadable](): I { return undefined } - get [Symbol.isRegExp]() { return undefined; } - set [Symbol.isRegExp](x: I) { } + get [Symbol.toPrimitive]() { return undefined; } + set [Symbol.toPrimitive](x: I) { } } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts index 18568e853e8..4e65648acca 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit13.ts @@ -1,6 +1,6 @@ //@target: ES6 //@declaration: true class C { - get [Symbol.isRegExp]() { return ""; } + get [Symbol.toPrimitive]() { return ""; } set [Symbol.toStringTag](x) { } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit14.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit14.ts index 312476628b8..c31629c82df 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit14.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit14.ts @@ -1,6 +1,6 @@ //@target: ES6 //@declaration: true class C { - get [Symbol.isRegExp]() { return ""; } + get [Symbol.toPrimitive]() { return ""; } get [Symbol.toStringTag]() { return ""; } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit2.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit2.ts index 420e1c84906..f5b00918b7e 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit2.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit2.ts @@ -1,5 +1,5 @@ //@target: ES6 //@declaration: true class C { - [Symbol.isRegExp] = ""; + [Symbol.toPrimitive] = ""; } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts index b70ee3c15ac..553aa871c38 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit3.ts @@ -1,7 +1,7 @@ //@target: ES6 //@declaration: true class C { - [Symbol.isRegExp](x: number); - [Symbol.isRegExp](x: string); - [Symbol.isRegExp](x: any) { } + [Symbol.toPrimitive](x: number); + [Symbol.toPrimitive](x: string); + [Symbol.toPrimitive](x: any) { } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit4.ts b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit4.ts index dde80577fa4..01c75fd05bf 100644 --- a/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit4.ts +++ b/tests/cases/conformance/es6/Symbols/symbolDeclarationEmit4.ts @@ -1,6 +1,6 @@ //@target: ES6 //@declaration: true class C { - get [Symbol.isRegExp]() { return ""; } - set [Symbol.isRegExp](x) { } + get [Symbol.toPrimitive]() { return ""; } + set [Symbol.toPrimitive](x) { } } \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty21.ts b/tests/cases/conformance/es6/Symbols/symbolProperty21.ts index 52e84a00425..f72e93e23a4 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty21.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty21.ts @@ -8,6 +8,6 @@ declare function foo(p: I): { t: T; u: U }; foo({ [Symbol.isConcatSpreadable]: "", - [Symbol.isRegExp]: 0, + [Symbol.toPrimitive]: 0, [Symbol.unscopables]: true }); \ No newline at end of file diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty5.ts b/tests/cases/conformance/es6/Symbols/symbolProperty5.ts index 84cb12a9de8..56afcda2ed1 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty5.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty5.ts @@ -1,7 +1,7 @@ //@target: ES6 var x = { [Symbol.iterator]: 0, - [Symbol.isRegExp]() { }, + [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; } diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty6.ts b/tests/cases/conformance/es6/Symbols/symbolProperty6.ts index ff17b977c38..24515e92a56 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty6.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty6.ts @@ -2,7 +2,7 @@ class C { [Symbol.iterator] = 0; [Symbol.unscopables]: number; - [Symbol.isRegExp]() { } + [Symbol.toPrimitive]() { } get [Symbol.toStringTag]() { return 0; } diff --git a/tests/cases/conformance/es6/Symbols/symbolProperty8.ts b/tests/cases/conformance/es6/Symbols/symbolProperty8.ts index 14b4a32688f..19c6583777e 100644 --- a/tests/cases/conformance/es6/Symbols/symbolProperty8.ts +++ b/tests/cases/conformance/es6/Symbols/symbolProperty8.ts @@ -1,5 +1,5 @@ //@target: ES6 interface I { [Symbol.unscopables]: number; - [Symbol.isRegExp](); + [Symbol.toPrimitive](); } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty4.ts b/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty4.ts index 6a0962f15cb..efb5a6819b0 100644 --- a/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty4.ts +++ b/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty4.ts @@ -1,4 +1,4 @@ //@target: ES6 declare class C { - [Symbol.isRegExp]: string; + [Symbol.toPrimitive]: string; } \ No newline at end of file diff --git a/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty5.ts b/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty5.ts index 5f3fbaeaaea..629d7ce0126 100644 --- a/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty5.ts +++ b/tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolProperty5.ts @@ -1,4 +1,4 @@ //@target: ES6 class C { - [Symbol.isRegExp]: string; + [Symbol.toPrimitive]: string; } \ No newline at end of file