Updated baselines.

DanielRosenwasser · DanielRosenwasser · commit 3d0655d08898 · 2015-04-09T14:28:29.000-07:00
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js
@@ -1,11 +1,11 @@
 //// [decoratorOnClassMethod11.ts]
-module M {
-    class C {
-        decorator(target: Object, key: string): void { }
-
-        @this.decorator
-        method() { }
-    }
+module M {
+    class C {
+        decorator(target: Object, key: string): void { }
+
+        @this.decorator
+        method() { }
+    }
 }
 
 //// [decoratorOnClassMethod11.js]
diff --git a/tests/baselines/reference/parserSymbolProperty4.js b/tests/baselines/reference/parserSymbolProperty4.js
@@ -1,6 +1,6 @@
 //// [parserSymbolProperty4.ts]
 declare class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
 }
 
 //// [parserSymbolProperty4.js]
diff --git a/tests/baselines/reference/parserSymbolProperty4.types b/tests/baselines/reference/parserSymbolProperty4.types
@@ -2,8 +2,8 @@
 declare class C {
 >C : C
 
-    [Symbol.isRegExp]: string;
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive]: string;
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 }
diff --git a/tests/baselines/reference/parserSymbolProperty5.js b/tests/baselines/reference/parserSymbolProperty5.js
@@ -1,6 +1,6 @@
 //// [parserSymbolProperty5.ts]
 class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
 }
 
 //// [parserSymbolProperty5.js]
diff --git a/tests/baselines/reference/parserSymbolProperty5.types b/tests/baselines/reference/parserSymbolProperty5.types
@@ -2,8 +2,8 @@
 class C {
 >C : C
 
-    [Symbol.isRegExp]: string;
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive]: string;
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit1.js b/tests/baselines/reference/symbolDeclarationEmit1.js
@@ -1,6 +1,6 @@
 //// [symbolDeclarationEmit1.ts]
 class C {
-    [Symbol.isRegExp]: number;
+    [Symbol.toPrimitive]: number;
 }
 
 //// [symbolDeclarationEmit1.js]
@@ -10,5 +10,5 @@ class C {
 
 //// [symbolDeclarationEmit1.d.ts]
 declare class C {
-    [Symbol.isRegExp]: number;
+    [Symbol.toPrimitive]: number;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit1.types b/tests/baselines/reference/symbolDeclarationEmit1.types
@@ -2,8 +2,8 @@
 class C {
 >C : C
 
-    [Symbol.isRegExp]: number;
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive]: number;
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit11.js b/tests/baselines/reference/symbolDeclarationEmit11.js
@@ -1,23 +1,23 @@
 //// [symbolDeclarationEmit11.ts]
 class C {
     static [Symbol.iterator] = 0;
-    static [Symbol.toPrimitive]() { }
-    static get [Symbol.isRegExp]() { return ""; }
-    static set [Symbol.isRegExp](x) { }
+    static [Symbol.isConcatSpreadable]() { }
+    static get [Symbol.toPrimitive]() { return ""; }
+    static set [Symbol.toPrimitive](x) { }
 }
 
 //// [symbolDeclarationEmit11.js]
 class C {
-    static [Symbol.toPrimitive]() { }
-    static get [Symbol.isRegExp]() { return ""; }
-    static set [Symbol.isRegExp](x) { }
+    static [Symbol.isConcatSpreadable]() { }
+    static get [Symbol.toPrimitive]() { return ""; }
+    static set [Symbol.toPrimitive](x) { }
 }
 C[Symbol.iterator] = 0;
 
 
 //// [symbolDeclarationEmit11.d.ts]
 declare class C {
     static [Symbol.iterator]: number;
-    static [Symbol.toPrimitive](): void;
-    static [Symbol.isRegExp]: string;
+    static [Symbol.isConcatSpreadable](): void;
+    static [Symbol.toPrimitive]: string;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit11.types b/tests/baselines/reference/symbolDeclarationEmit11.types
@@ -7,19 +7,19 @@ class C {
 >Symbol : SymbolConstructor
 >iterator : symbol
 
-    static [Symbol.toPrimitive]() { }
->Symbol.toPrimitive : symbol
+    static [Symbol.isConcatSpreadable]() { }
+>Symbol.isConcatSpreadable : symbol
 >Symbol : SymbolConstructor
->toPrimitive : symbol
+>isConcatSpreadable : symbol
 
-    static get [Symbol.isRegExp]() { return ""; }
->Symbol.isRegExp : symbol
+    static get [Symbol.toPrimitive]() { return ""; }
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 
-    static set [Symbol.isRegExp](x) { }
->Symbol.isRegExp : symbol
+    static set [Symbol.toPrimitive](x) { }
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 >x : string
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt
@@ -1,27 +1,36 @@
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(4,28): error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'.
+tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,9): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,33): error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'.
 tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(6,40): error TS4055: Return type of public method from exported class has or is using private name 'I'.
-tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,34): error TS4037: Parameter '[Symbol.isRegExp]' of public property setter from exported class has or is using private name 'I'.
+tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(9,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4037: Parameter '[Symbol.toPrimitive]' of public property setter from exported class has or is using private name 'I'.
 
 
-==== tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts (4 errors) ====
+==== tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts (7 errors) ====
     module M {
         interface I { }
         export class C {
             [Symbol.iterator]: I;
                                ~
 !!! error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'.
             [Symbol.toPrimitive](x: I) { }
+            ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
                                     ~
 !!! error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'.
             [Symbol.isConcatSpreadable](): I {
                                            ~
 !!! error TS4055: Return type of public method from exported class has or is using private name 'I'.
                 return undefined
             }
-            get [Symbol.isRegExp]() { return undefined; }
-            set [Symbol.isRegExp](x: I) { }
-                                     ~
-!!! error TS4037: Parameter '[Symbol.isRegExp]' of public property setter from exported class has or is using private name 'I'.
+            get [Symbol.toPrimitive]() { return undefined; }
+                ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+            set [Symbol.toPrimitive](x: I) { }
+                ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'.
+                                        ~
+!!! error TS4037: Parameter '[Symbol.toPrimitive]' of public property setter from exported class has or is using private name 'I'.
         }
     }
diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js
@@ -7,8 +7,8 @@ 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) { }
     }
 }
 
@@ -20,8 +20,8 @@ var M;
         [Symbol.isConcatSpreadable]() {
             return undefined;
         }
-        get [Symbol.isRegExp]() { return undefined; }
-        set [Symbol.isRegExp](x) { }
+        get [Symbol.toPrimitive]() { return undefined; }
+        set [Symbol.toPrimitive](x) { }
     }
     M.C = C;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/symbolDeclarationEmit13.js b/tests/baselines/reference/symbolDeclarationEmit13.js
@@ -1,18 +1,18 @@
 //// [symbolDeclarationEmit13.ts]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
+    get [Symbol.toPrimitive]() { return ""; }
     set [Symbol.toStringTag](x) { }
 }
 
 //// [symbolDeclarationEmit13.js]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
+    get [Symbol.toPrimitive]() { return ""; }
     set [Symbol.toStringTag](x) { }
 }
 
 
 //// [symbolDeclarationEmit13.d.ts]
 declare class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
     [Symbol.toStringTag]: any;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit13.types b/tests/baselines/reference/symbolDeclarationEmit13.types
@@ -2,10 +2,10 @@
 class C {
 >C : C
 
-    get [Symbol.isRegExp]() { return ""; }
->Symbol.isRegExp : symbol
+    get [Symbol.toPrimitive]() { return ""; }
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 
     set [Symbol.toStringTag](x) { }
 >Symbol.toStringTag : symbol
diff --git a/tests/baselines/reference/symbolDeclarationEmit14.js b/tests/baselines/reference/symbolDeclarationEmit14.js
@@ -1,18 +1,18 @@
 //// [symbolDeclarationEmit14.ts]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
+    get [Symbol.toPrimitive]() { return ""; }
     get [Symbol.toStringTag]() { return ""; }
 }
 
 //// [symbolDeclarationEmit14.js]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
+    get [Symbol.toPrimitive]() { return ""; }
     get [Symbol.toStringTag]() { return ""; }
 }
 
 
 //// [symbolDeclarationEmit14.d.ts]
 declare class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
     [Symbol.toStringTag]: string;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit14.types b/tests/baselines/reference/symbolDeclarationEmit14.types
@@ -2,10 +2,10 @@
 class C {
 >C : C
 
-    get [Symbol.isRegExp]() { return ""; }
->Symbol.isRegExp : symbol
+    get [Symbol.toPrimitive]() { return ""; }
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 
     get [Symbol.toStringTag]() { return ""; }
 >Symbol.toStringTag : symbol
diff --git a/tests/baselines/reference/symbolDeclarationEmit2.js b/tests/baselines/reference/symbolDeclarationEmit2.js
@@ -1,17 +1,17 @@
 //// [symbolDeclarationEmit2.ts]
 class C {
-    [Symbol.isRegExp] = "";
+    [Symbol.toPrimitive] = "";
 }
 
 //// [symbolDeclarationEmit2.js]
 class C {
     constructor() {
-        this[Symbol.isRegExp] = "";
+        this[Symbol.toPrimitive] = "";
     }
 }
 
 
 //// [symbolDeclarationEmit2.d.ts]
 declare class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit2.types b/tests/baselines/reference/symbolDeclarationEmit2.types
@@ -2,8 +2,8 @@
 class C {
 >C : C
 
-    [Symbol.isRegExp] = "";
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive] = "";
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit3.js b/tests/baselines/reference/symbolDeclarationEmit3.js
@@ -1,18 +1,18 @@
 //// [symbolDeclarationEmit3.ts]
 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) { }
 }
 
 //// [symbolDeclarationEmit3.js]
 class C {
-    [Symbol.isRegExp](x) { }
+    [Symbol.toPrimitive](x) { }
 }
 
 
 //// [symbolDeclarationEmit3.d.ts]
 declare class C {
-    [Symbol.isRegExp](x: number): any;
-    [Symbol.isRegExp](x: string): any;
+    [Symbol.toPrimitive](x: number): any;
+    [Symbol.toPrimitive](x: string): any;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit3.types b/tests/baselines/reference/symbolDeclarationEmit3.types
@@ -2,21 +2,21 @@
 class C {
 >C : C
 
-    [Symbol.isRegExp](x: number);
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive](x: number);
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 >x : number
 
-    [Symbol.isRegExp](x: string);
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive](x: string);
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 >x : string
 
-    [Symbol.isRegExp](x: any) { }
->Symbol.isRegExp : symbol
+    [Symbol.toPrimitive](x: any) { }
+>Symbol.toPrimitive : symbol
 >Symbol : SymbolConstructor
->isRegExp : symbol
+>toPrimitive : symbol
 >x : any
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit4.js b/tests/baselines/reference/symbolDeclarationEmit4.js
@@ -1,17 +1,17 @@
 //// [symbolDeclarationEmit4.ts]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
-    set [Symbol.isRegExp](x) { }
+    get [Symbol.toPrimitive]() { return ""; }
+    set [Symbol.toPrimitive](x) { }
 }
 
 //// [symbolDeclarationEmit4.js]
 class C {
-    get [Symbol.isRegExp]() { return ""; }
-    set [Symbol.isRegExp](x) { }
+    get [Symbol.toPrimitive]() { return ""; }
+    set [Symbol.toPrimitive](x) { }
 }
 
 
 //// [symbolDeclarationEmit4.d.ts]
 declare class C {
-    [Symbol.isRegExp]: string;
+    [Symbol.toPrimitive]: string;
 }
diff --git a/tests/baselines/reference/symbolDeclarationEmit4.types b/tests/baselines/reference/symbolDeclarationEmit4.types
diff --git a/tests/baselines/reference/symbolProperty21.js b/tests/baselines/reference/symbolProperty21.js
diff --git a/tests/baselines/reference/symbolProperty21.types b/tests/baselines/reference/symbolProperty21.types
diff --git a/tests/baselines/reference/symbolProperty5.js b/tests/baselines/reference/symbolProperty5.js
diff --git a/tests/baselines/reference/symbolProperty5.types b/tests/baselines/reference/symbolProperty5.types
diff --git a/tests/baselines/reference/symbolProperty6.js b/tests/baselines/reference/symbolProperty6.js
diff --git a/tests/baselines/reference/symbolProperty6.types b/tests/baselines/reference/symbolProperty6.types
diff --git a/tests/baselines/reference/symbolProperty8.js b/tests/baselines/reference/symbolProperty8.js
diff --git a/tests/baselines/reference/symbolProperty8.types b/tests/baselines/reference/symbolProperty8.types

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`//// [parserSymbolProperty4.ts]`
`2`	`2`	`declare class C {`
`3`		`- [Symbol.isRegExp]: string;`
	`3`	`+ [Symbol.toPrimitive]: string;`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`//// [parserSymbolProperty4.js]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`//// [parserSymbolProperty5.ts]`
`2`	`2`	`class C {`
`3`		`- [Symbol.isRegExp]: string;`
	`3`	`+ [Symbol.toPrimitive]: string;`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`//// [parserSymbolProperty5.js]`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`//// [symbolDeclarationEmit1.ts]`
`2`	`2`	`class C {`
`3`		`- [Symbol.isRegExp]: number;`
	`3`	`+ [Symbol.toPrimitive]: number;`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`//// [symbolDeclarationEmit1.js]`
`@@ -10,5 +10,5 @@ class C {`
`10`	`10`
`11`	`11`	`//// [symbolDeclarationEmit1.d.ts]`
`12`	`12`	`declare class C {`
`13`		`- [Symbol.isRegExp]: number;`
	`13`	`+ [Symbol.toPrimitive]: number;`
`14`	`14`	`}`