Add an _es6 suffix to prevent name collisions.

tests/baselines/reference/ComputedPropertyName10_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts(2,8): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10_es6.ts(2,8): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName10_es6.ts (1 errors) ====
     class C {
        [e] = 1
            ~

tests/baselines/reference/ComputedPropertyName11_es6.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(2,7): error TS1005: ';' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(2,8): error TS1109: Expression expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11_es6.ts(2,7): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11_es6.ts(2,8): error TS1109: Expression expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11_es6.ts(3,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11.ts (3 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName11_es6.ts (3 errors) ====
     class C {
        [e]();
           ~

tests/baselines/reference/ComputedPropertyName12_es6.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(2,7): error TS1005: ';' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(2,10): error TS1005: '=>' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12_es6.ts(2,7): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12_es6.ts(2,10): error TS1005: '=>' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12_es6.ts(3,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12.ts (3 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName12_es6.ts (3 errors) ====
     class C {
        [e]() { }
           ~

tests/baselines/reference/ComputedPropertyName13_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts(1,11): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13_es6.ts(1,11): error TS1022: An index signature parameter must have a type annotation.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName13_es6.ts (1 errors) ====
     var v: { [e]: number };
               ~
 !!! error TS1022: An index signature parameter must have a type annotation.

tests/baselines/reference/ComputedPropertyName14_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts(1,13): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14_es6.ts(1,13): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName14_es6.ts (1 errors) ====
     var v: { [e](): number };
                 ~
 !!! error TS1005: ';' expected.

tests/baselines/reference/ComputedPropertyName15_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts(1,32): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15_es6.ts(1,32): error TS1022: An index signature parameter must have a type annotation.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName15_es6.ts (1 errors) ====
     var v: { [e: number]: string; [e]: number };
                                    ~
 !!! error TS1022: An index signature parameter must have a type annotation.

tests/baselines/reference/ComputedPropertyName16_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,3): error TS1132: Enum member expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(3,1): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,3): error TS2364: Invalid left-hand side of assignment expression.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts(2,4): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16_es6.ts(2,3): error TS1132: Enum member expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16_es6.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16_es6.ts(2,3): error TS2364: Invalid left-hand side of assignment expression.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16_es6.ts(2,4): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16.ts (4 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName16_es6.ts (4 errors) ====
     enum E {
       [e] = 1
       ~

tests/baselines/reference/ComputedPropertyName17_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,15): error TS1003: Identifier expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,22): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,26): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts(1,16): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17_es6.ts(1,15): error TS1003: Identifier expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17_es6.ts(1,22): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17_es6.ts(1,26): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17_es6.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17.ts (4 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName17_es6.ts (4 errors) ====
     var v = { set [e](v) { } }
                   ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/ComputedPropertyName18_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts(1,13): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18_es6.ts(1,13): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName18_es6.ts (1 errors) ====
     var v: { [e]?(): number };
                 ~
 !!! error TS1005: ';' expected.

tests/baselines/reference/ComputedPropertyName19_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts(1,13): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19_es6.ts(1,13): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName19_es6.ts (1 errors) ====
     var v: { [e]? };
                 ~
 !!! error TS1005: ';' expected.

tests/baselines/reference/ComputedPropertyName1_es6.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,11): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,15): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1_es6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1_es6.ts(1,15): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1_es6.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1.ts (3 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName1_es6.ts (3 errors) ====
     var v = { [e] };
               ~
 !!! error TS1136: Property assignment expected.

tests/baselines/reference/ComputedPropertyName2_es6.errors.txt

@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,11): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,14): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,16): error TS1134: Variable declaration expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,18): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts(1,14): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts(1,16): error TS1134: Variable declaration expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts(1,18): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2.ts (5 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName2_es6.ts (5 errors) ====
     var v = { [e]: 1 };
               ~
 !!! error TS1136: Property assignment expected.

tests/baselines/reference/ComputedPropertyName3_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,11): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,17): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,21): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3_es6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3_es6.ts(1,17): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3_es6.ts(1,21): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3_es6.ts(1,12): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3.ts (4 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName3_es6.ts (4 errors) ====
     var v = { [e]() { } };
               ~
 !!! error TS1136: Property assignment expected.

tests/baselines/reference/ComputedPropertyName4_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,15): error TS1003: Identifier expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,21): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,25): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts(1,16): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4_es6.ts(1,15): error TS1003: Identifier expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4_es6.ts(1,21): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4_es6.ts(1,25): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4_es6.ts(1,16): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4.ts (4 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName4_es6.ts (4 errors) ====
     var v = { get [e]() { } };
                   ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/ComputedPropertyName5_es6.errors.txt

@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,18): error TS1005: ':' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,28): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,32): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,18): error TS2304: Cannot find name 'get'.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts(1,23): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts(1,18): error TS1005: ':' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts(1,28): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts(1,32): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts(1,18): error TS2304: Cannot find name 'get'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts(1,23): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5.ts (5 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName5_es6.ts (5 errors) ====
     var v = { public get [e]() { } };
                      ~~~
 !!! error TS1005: ':' expected.

tests/baselines/reference/ComputedPropertyName6_es6.errors.txt

@@ -1,14 +1,14 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,11): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,14): error TS1005: ',' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,16): error TS1134: Variable declaration expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,26): error TS1005: ';' expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,30): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,12): error TS2304: Cannot find name 'e'.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,20): error TS2304: Cannot find name 'e'.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts(1,24): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,14): error TS1005: ',' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,16): error TS1134: Variable declaration expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,26): error TS1005: ';' expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,30): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,12): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,20): error TS2304: Cannot find name 'e'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts(1,24): error TS2304: Cannot find name 'e'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6.ts (8 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName6_es6.ts (8 errors) ====
     var v = { [e]: 1, [e + e]: 2 };
               ~
 !!! error TS1136: Property assignment expected.

tests/baselines/reference/ComputedPropertyName7_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7_es6.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName7_es6.ts (1 errors) ====
     class C {
        [e]
         ~

tests/baselines/reference/ComputedPropertyName8_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts(2,12): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8_es6.ts(2,12): error TS1022: An index signature parameter must have a type annotation.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName8_es6.ts (1 errors) ====
     class C {
        public [e]
                ~

tests/baselines/reference/ComputedPropertyName9_es6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
-tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts(2,9): error TS2304: Cannot find name 'Type'.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9_es6.ts(2,5): error TS1022: An index signature parameter must have a type annotation.
+tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9_es6.ts(2,9): error TS2304: Cannot find name 'Type'.
 
 
-==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedPropertyNames/ComputedPropertyName9_es6.ts (2 errors) ====
     class C {
        [e]: Type
         ~

tests/baselines/reference/FunctionDeclaration1.js

@@ -1,7 +0,0 @@
-//// [FunctionDeclaration1.ts]
-function * foo() {
-}
-
-//// [FunctionDeclaration1.js]
-function foo() {
-}

tests/baselines/reference/FunctionDeclaration10_es6.js

@@ -1,8 +1,8 @@
-//// [FunctionDeclaration10.ts]
+//// [FunctionDeclaration10_es6.ts]
 function * foo(a = yield => yield) {
 }
 
-//// [FunctionDeclaration10.js]
+//// [FunctionDeclaration10_es6.js]
 function foo(a) {
     if (a === void 0) { a = function (yield) { return yield; }; }
 }

tests/baselines/reference/FunctionDeclaration10_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10.ts ===
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts ===
 function * foo(a = yield => yield) {
 >foo : (a?: (yield: any) => any) => void
 >a : (yield: any) => any

tests/baselines/reference/FunctionDeclaration11.js

@@ -1,7 +0,0 @@
-//// [FunctionDeclaration11.ts]
-function * yield() {
-}
-
-//// [FunctionDeclaration11.js]
-function yield() {
-}

tests/baselines/reference/FunctionDeclaration11_es6.js

@@ -0,0 +1,7 @@
+//// [FunctionDeclaration11_es6.ts]
+function * yield() {
+}
+
+//// [FunctionDeclaration11_es6.js]
+function yield() {
+}

tests/baselines/reference/FunctionDeclaration11_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11.ts ===
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11_es6.ts ===
 function * yield() {
 >yield : () => void
 }

tests/baselines/reference/FunctionDeclaration12_es6.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,20): error TS1005: '(' expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,25): error TS1005: '=' expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts(1,28): error TS1005: '=>' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12_es6.ts(1,20): error TS1005: '(' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12_es6.ts(1,25): error TS1005: '=' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12_es6.ts(1,28): error TS1005: '=>' expected.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12.ts (3 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration12_es6.ts (3 errors) ====
     var v = function * yield() { }
                        ~~~~~
 !!! error TS1005: '(' expected.

tests/baselines/reference/FunctionDeclaration13_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts(3,11): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts(3,11): error TS2304: Cannot find name 'yield'.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts (1 errors) ====
     function * foo() {
        // Legal to use 'yield' in a type context.
        var v: yield;

tests/baselines/reference/FunctionDeclaration13_es6.js

@@ -1,11 +1,11 @@
-//// [FunctionDeclaration13.ts]
+//// [FunctionDeclaration13_es6.ts]
 function * foo() {
    // Legal to use 'yield' in a type context.
    var v: yield;
 }
 
 
-//// [FunctionDeclaration13.js]
+//// [FunctionDeclaration13_es6.js]
 function foo() {
     // Legal to use 'yield' in a type context.
     var v;

tests/baselines/reference/FunctionDeclaration1_es6.js

@@ -0,0 +1,7 @@
+//// [FunctionDeclaration1_es6.ts]
+function * foo() {
+}
+
+//// [FunctionDeclaration1_es6.js]
+function foo() {
+}

tests/baselines/reference/FunctionDeclaration1_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1.ts ===
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1_es6.ts ===
 function * foo() {
 >foo : () => void
 }

tests/baselines/reference/FunctionDeclaration2.js

@@ -1,7 +0,0 @@
-//// [FunctionDeclaration2.ts]
-function f(yield) {
-}
-
-//// [FunctionDeclaration2.js]
-function f(yield) {
-}

tests/baselines/reference/FunctionDeclaration2_es6.js

@@ -0,0 +1,7 @@
+//// [FunctionDeclaration2_es6.ts]
+function f(yield) {
+}
+
+//// [FunctionDeclaration2_es6.js]
+function f(yield) {
+}

tests/baselines/reference/FunctionDeclaration2_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2.ts ===
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration2_es6.ts ===
 function f(yield) {
 >f : (yield: any) => void
 >yield : any

tests/baselines/reference/FunctionDeclaration3_es6.errors.txt

@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration3_es6.ts(1,20): error TS2372: Parameter 'yield' cannot be referenced in its initializer.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration3_es6.ts (1 errors) ====
+    function f(yield = yield) {
+                       ~~~~~
+!!! error TS2372: Parameter 'yield' cannot be referenced in its initializer.
+    }

tests/baselines/reference/FunctionDeclaration3_es6.js

@@ -0,0 +1,8 @@
+//// [FunctionDeclaration3_es6.ts]
+function f(yield = yield) {
+}
+
+//// [FunctionDeclaration3_es6.js]
+function f(yield) {
+    if (yield === void 0) { yield = yield; }
+}

tests/baselines/reference/FunctionDeclaration4_es6.js

@@ -0,0 +1,7 @@
+//// [FunctionDeclaration4_es6.ts]
+function yield() {
+}
+
+//// [FunctionDeclaration4_es6.js]
+function yield() {
+}

tests/baselines/reference/FunctionDeclaration4_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4.ts ===
+=== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration4_es6.ts ===
 function yield() {
 >yield : () => void
 }

tests/baselines/reference/FunctionDeclaration5_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,14): error TS1138: Parameter declaration expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,19): error TS1005: ';' expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts(1,14): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5_es6.ts(1,14): error TS1138: Parameter declaration expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5_es6.ts(1,19): error TS1005: ';' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5_es6.ts(1,10): error TS2391: Function implementation is missing or not immediately following the declaration.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5_es6.ts(1,14): error TS2304: Cannot find name 'yield'.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5.ts (4 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration5_es6.ts (4 errors) ====
     function*foo(yield) {
                  ~~~~~
 !!! error TS1138: Parameter declaration expected.

tests/baselines/reference/FunctionDeclaration6_es6.errors.txt

@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts(1,18): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts (1 errors) ====
+    function*foo(a = yield) {
+                     ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+    }

tests/baselines/reference/FunctionDeclaration6_es6.js

@@ -0,0 +1,8 @@
+//// [FunctionDeclaration6_es6.ts]
+function*foo(a = yield) {
+}
+
+//// [FunctionDeclaration6_es6.js]
+function foo(a) {
+    if (a === void 0) { a = yield; }
+}

tests/baselines/reference/FunctionDeclaration7_es6.errors.txt

@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts(3,20): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts (1 errors) ====
+    function*bar() {
+      // 'yield' here is an identifier, and not a yield expression.
+      function*foo(a = yield) {
+                       ~~~~~
+!!! error TS2304: Cannot find name 'yield'.
+      }
+    }

tests/baselines/reference/FunctionDeclaration7_es6.js

@@ -0,0 +1,14 @@
+//// [FunctionDeclaration7_es6.ts]
+function*bar() {
+  // 'yield' here is an identifier, and not a yield expression.
+  function*foo(a = yield) {
+  }
+}
+
+//// [FunctionDeclaration7_es6.js]
+function bar() {
+    // 'yield' here is an identifier, and not a yield expression.
+    function foo(a) {
+        if (a === void 0) { a = yield; }
+    }
+}

tests/baselines/reference/FunctionDeclaration8_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,11): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,18): error TS1005: ',' expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,24): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts(1,12): error TS2304: Cannot find name 'yield'.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,11): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,18): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,24): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,12): error TS2304: Cannot find name 'yield'.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8.ts (4 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts (4 errors) ====
     var v = { [yield]: foo }
               ~
 !!! error TS1136: Property assignment expected.

tests/baselines/reference/FunctionDeclaration9_es6.errors.txt

@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(2,13): error TS1136: Property assignment expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(2,20): error TS1005: ',' expected.
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts(3,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(2,13): error TS1136: Property assignment expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(2,20): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(3,1): error TS1128: Declaration or statement expected.
 
 
-==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9.ts (3 errors) ====
+==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts (3 errors) ====
     function * foo() {
       var v = { [yield]: foo }
                 ~

tests/baselines/reference/FunctionExpression1.js

@@ -1,6 +0,0 @@
-//// [FunctionExpression1.ts]
-var v = function * () { }
-
-//// [FunctionExpression1.js]
-var v = function () {
-};

tests/baselines/reference/FunctionExpression1_es6.js

@@ -0,0 +1,6 @@
+//// [FunctionExpression1_es6.ts]
+var v = function * () { }
+
+//// [FunctionExpression1_es6.js]
+var v = function () {
+};

tests/baselines/reference/FunctionExpression1_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionExpressions/FunctionExpression1.ts ===
+=== tests/cases/conformance/es6/functionExpressions/FunctionExpression1_es6.ts ===
 var v = function * () { }
 >v : () => void
 >function * () { } : () => void

tests/baselines/reference/FunctionExpression2.js

@@ -1,6 +0,0 @@
-//// [FunctionExpression2.ts]
-var v = function * foo() { }
-
-//// [FunctionExpression2.js]
-var v = function foo() {
-};

tests/baselines/reference/FunctionExpression2_es6.js

@@ -0,0 +1,6 @@
+//// [FunctionExpression2_es6.ts]
+var v = function * foo() { }
+
+//// [FunctionExpression2_es6.js]
+var v = function foo() {
+};

tests/baselines/reference/FunctionExpression2_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionExpressions/FunctionExpression2.ts ===
+=== tests/cases/conformance/es6/functionExpressions/FunctionExpression2_es6.ts ===
 var v = function * foo() { }
 >v : () => void
 >function * foo() { } : () => void

tests/baselines/reference/FunctionPropertyAssignments1.js

@@ -1,6 +0,0 @@
-//// [FunctionPropertyAssignments1.ts]
-var v = { *foo() { } }
-
-//// [FunctionPropertyAssignments1.js]
-var v = { foo: function () {
-} };

tests/baselines/reference/FunctionPropertyAssignments1_es6.js

@@ -0,0 +1,6 @@
+//// [FunctionPropertyAssignments1_es6.ts]
+var v = { *foo() { } }
+
+//// [FunctionPropertyAssignments1_es6.js]
+var v = { foo: function () {
+} };

tests/baselines/reference/FunctionPropertyAssignments1_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1.ts ===
+=== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6.ts ===
 var v = { *foo() { } }
 >v : { foo: () => void; }
 >{ *foo() { } } : { foo: () => void; }

tests/baselines/reference/FunctionPropertyAssignments2_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts(1,12): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2_es6.ts(1,12): error TS1003: Identifier expected.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments2_es6.ts (1 errors) ====
     var v = { *() { } }
                ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/FunctionPropertyAssignments3_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts(1,12): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3_es6.ts(1,12): error TS1003: Identifier expected.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments3_es6.ts (1 errors) ====
     var v = { *{ } }
                ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/FunctionPropertyAssignments4_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts(1,13): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4_es6.ts(1,13): error TS1003: Identifier expected.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments4_es6.ts (1 errors) ====
     var v = { * }
                 ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,12): error TS1003: Identifier expected.
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,22): error TS1005: ',' expected.
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,26): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts(1,13): error TS2304: Cannot find name 'foo'.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,12): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,22): error TS1005: ',' expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,26): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,13): error TS2304: Cannot find name 'foo'.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5.ts (4 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts (4 errors) ====
     var v = { *[foo()]() { } }
                ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/FunctionPropertyAssignments6_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts(1,12): error TS1003: Identifier expected.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6_es6.ts(1,12): error TS1003: Identifier expected.
 
 
-==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6.ts (1 errors) ====
+==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments6_es6.ts (1 errors) ====
     var v = { *<T>() { } }
                ~
 !!! error TS1003: Identifier expected.

tests/baselines/reference/MemberFunctionDeclaration1.types

@@ -1,7 +0,0 @@
-=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration1.ts ===
-class C {
->C : C
-
-   *foo() { }
->foo : () => void
-}

tests/baselines/reference/MemberFunctionDeclaration1_es6.js

@@ -1,9 +1,9 @@
-//// [MemberFunctionDeclaration1.ts]
+//// [MemberFunctionDeclaration1_es6.ts]
 class C {
    *foo() { }
 }
 
-//// [MemberFunctionDeclaration1.js]
+//// [MemberFunctionDeclaration1_es6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/MemberFunctionDeclaration1_es6.types

@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6.ts ===
+class C {
+>C : C
+
+   *foo() { }
+>foo : () => void
+}

tests/baselines/reference/MemberFunctionDeclaration2.types

@@ -1,7 +0,0 @@
-=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration2.ts ===
-class C {
->C : C
-
-   public * foo() { }
->foo : () => void
-}

tests/baselines/reference/MemberFunctionDeclaration2_es6.js

@@ -1,9 +1,9 @@
-//// [MemberFunctionDeclaration2.ts]
+//// [MemberFunctionDeclaration2_es6.ts]
 class C {
    public * foo() { }
 }
 
-//// [MemberFunctionDeclaration2.js]
+//// [MemberFunctionDeclaration2_es6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/MemberFunctionDeclaration2_es6.types

@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6.ts ===
+class C {
+>C : C
+
+   public * foo() { }
+>foo : () => void
+}

tests/baselines/reference/MemberFunctionDeclaration3.errors.txt

@@ -1,18 +0,0 @@
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,5): error TS1003: Identifier expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,10): error TS1005: ';' expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(2,13): error TS1005: '=>' expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts(3,1): error TS1128: Declaration or statement expected.
-
-
-==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration3.ts (4 errors) ====
-    class C {
-       *[foo]() { }
-        ~
-!!! error TS1003: Identifier expected.
-             ~
-!!! error TS1005: ';' expected.
-                ~
-!!! error TS1005: '=>' expected.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.

tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt

@@ -0,0 +1,18 @@
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,5): error TS1003: Identifier expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,10): error TS1005: ';' expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,13): error TS1005: '=>' expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(3,1): error TS1128: Declaration or statement expected.
+
+
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts (4 errors) ====
+    class C {
+       *[foo]() { }
+        ~
+!!! error TS1003: Identifier expected.
+             ~
+!!! error TS1005: ';' expected.
+                ~
+!!! error TS1005: '=>' expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.

tests/baselines/reference/MemberFunctionDeclaration4.errors.txt

@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts(2,5): error TS1003: Identifier expected.
-
-
-==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration4.ts (1 errors) ====
-    class C {
-       *() { }
-        ~
-!!! error TS1003: Identifier expected.
-    }

tests/baselines/reference/MemberFunctionDeclaration4_es6.errors.txt

@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration4_es6.ts(2,5): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration4_es6.ts (1 errors) ====
+    class C {
+       *() { }
+        ~
+!!! error TS1003: Identifier expected.
+    }

tests/baselines/reference/MemberFunctionDeclaration5.errors.txt

@@ -1,9 +0,0 @@
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts(3,1): error TS1003: Identifier expected.
-
-
-==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration5.ts (1 errors) ====
-    class C {
-       *
-    }
-    ~
-!!! error TS1003: Identifier expected.

tests/baselines/reference/MemberFunctionDeclaration5_es6.errors.txt

@@ -0,0 +1,9 @@
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration5_es6.ts(3,1): error TS1003: Identifier expected.
+
+
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration5_es6.ts (1 errors) ====
+    class C {
+       *
+    }
+    ~
+!!! error TS1003: Identifier expected.

tests/baselines/reference/MemberFunctionDeclaration6.errors.txt

@@ -1,12 +0,0 @@
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts(3,1): error TS1005: '(' expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts(2,5): error TS2391: Function implementation is missing or not immediately following the declaration.
-
-
-==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration6.ts (2 errors) ====
-    class C {
-       *foo
-        ~~~
-!!! error TS2391: Function implementation is missing or not immediately following the declaration.
-    }
-    ~
-!!! error TS1005: '(' expected.

tests/baselines/reference/MemberFunctionDeclaration6_es6.errors.txt

@@ -0,0 +1,12 @@
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration6_es6.ts(3,1): error TS1005: '(' expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration6_es6.ts(2,5): error TS2391: Function implementation is missing or not immediately following the declaration.
+
+
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration6_es6.ts (2 errors) ====
+    class C {
+       *foo
+        ~~~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+    }
+    ~
+!!! error TS1005: '(' expected.

tests/baselines/reference/MemberFunctionDeclaration7.types

@@ -1,8 +0,0 @@
-=== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration7.ts ===
-class C {
->C : C
-
-   *foo<T>() { }
->foo : <T>() => void
->T : T
-}

tests/baselines/reference/MemberFunctionDeclaration7_es6.js

@@ -1,9 +1,9 @@
-//// [MemberFunctionDeclaration7.ts]
+//// [MemberFunctionDeclaration7_es6.ts]
 class C {
    *foo<T>() { }
 }
 
-//// [MemberFunctionDeclaration7.js]
+//// [MemberFunctionDeclaration7_es6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/MemberFunctionDeclaration7_es6.types

@@ -0,0 +1,8 @@
+=== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6.ts ===
+class C {
+>C : C
+
+   *foo<T>() { }
+>foo : <T>() => void
+>T : T
+}

tests/baselines/reference/MemberFunctionDeclaration8.errors.txt

@@ -1,34 +0,0 @@
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,12): error TS1127: Invalid character.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,14): error TS1129: Statement expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,19): error TS1005: '(' expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(5,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(6,3): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(7,1): error TS1128: Declaration or statement expected.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,9): error TS2304: Cannot find name 'a'.
-tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts(4,16): error TS2391: Function implementation is missing or not immediately following the declaration.
-
-
-==== tests/cases/conformance/es6/fmmberFunctionDeclarations/MemberFunctionDeclaration8.ts (8 errors) ====
-    class C {
-      foo() {
-        // Make sure we don't think of *bar as the start of a generator method.
-        if (a) # * bar;
-               
-!!! error TS1127: Invalid character.
-                 ~
-!!! error TS1129: Statement expected.
-                      ~
-!!! error TS1005: '(' expected.
-            ~
-!!! error TS2304: Cannot find name 'a'.
-                   ~~~
-!!! error TS2391: Function implementation is missing or not immediately following the declaration.
-        return bar; 
-        ~~~~~~
-!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
-      }
-      ~
-!!! error TS1128: Declaration or statement expected.
-    }
-    ~
-!!! error TS1128: Declaration or statement expected.

tests/baselines/reference/MemberFunctionDeclaration8_es6.errors.txt

@@ -0,0 +1,34 @@
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(4,12): error TS1127: Invalid character.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(4,14): error TS1129: Statement expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(4,19): error TS1005: '(' expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(5,5): error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(6,3): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(7,1): error TS1128: Declaration or statement expected.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(4,9): error TS2304: Cannot find name 'a'.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts(4,16): error TS2391: Function implementation is missing or not immediately following the declaration.
+
+
+==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration8_es6.ts (8 errors) ====
+    class C {
+      foo() {
+        // Make sure we don't think of *bar as the start of a generator method.
+        if (a) # * bar;
+               
+!!! error TS1127: Invalid character.
+                 ~
+!!! error TS1129: Statement expected.
+                      ~
+!!! error TS1005: '(' expected.
+            ~
+!!! error TS2304: Cannot find name 'a'.
+                   ~~~
+!!! error TS2391: Function implementation is missing or not immediately following the declaration.
+        return bar; 
+        ~~~~~~
+!!! error TS1068: Unexpected token. A constructor, method, accessor, or property was expected.
+      }
+      ~
+!!! error TS1128: Declaration or statement expected.
+    }
+    ~
+!!! error TS1128: Declaration or statement expected.

tests/baselines/reference/YieldExpression1.errors.txt

@@ -1,7 +0,0 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts(1,1): error TS2304: Cannot find name 'yield'.
-
-
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression1.ts (1 errors) ====
-    yield;
-    ~~~~~
-!!! error TS2304: Cannot find name 'yield'.

tests/baselines/reference/YieldExpression1.js

@@ -1,5 +0,0 @@
-//// [YieldExpression1.ts]
-yield;
-
-//// [YieldExpression1.js]
-yield;

tests/baselines/reference/YieldExpression10_es6.js

@@ -1,11 +1,11 @@
-//// [YieldExpression10.ts]
+//// [YieldExpression10_es6.ts]
 var v = { * foo() {
     yield(foo);
   }
 }
 
 
-//// [YieldExpression10.js]
+//// [YieldExpression10_es6.js]
 var v = { foo: function () {
     ;
 } };

tests/baselines/reference/YieldExpression10_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/yieldExpressions/YieldExpression10.ts ===
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression10_es6.ts ===
 var v = { * foo() {
 >v : { foo: () => void; }
 >{ * foo() {    yield(foo);  }} : { foo: () => void; }

tests/baselines/reference/YieldExpression11_es6.js

@@ -1,11 +1,11 @@
-//// [YieldExpression11.ts]
+//// [YieldExpression11_es6.ts]
 class C {
   *foo() {
     yield(foo);
   }
 }
 
-//// [YieldExpression11.js]
+//// [YieldExpression11_es6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/YieldExpression11_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/yieldExpressions/YieldExpression11.ts ===
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts ===
 class C {
 >C : C
 

tests/baselines/reference/YieldExpression12_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression12_es6.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
 
 
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression12.ts (1 errors) ====
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression12_es6.ts (1 errors) ====
     class C {
       constructor() {
          yield foo

tests/baselines/reference/YieldExpression13.js

@@ -1,7 +0,0 @@
-//// [YieldExpression13.ts]
-function* foo() { yield }
-
-//// [YieldExpression13.js]
-function foo() {
-    ;
-}

tests/baselines/reference/YieldExpression13_es6.js

@@ -0,0 +1,7 @@
+//// [YieldExpression13_es6.ts]
+function* foo() { yield }
+
+//// [YieldExpression13_es6.js]
+function foo() {
+    ;
+}

tests/baselines/reference/YieldExpression13_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/yieldExpressions/YieldExpression13.ts ===
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts ===
 function* foo() { yield }
 >foo : () => void
 

tests/baselines/reference/YieldExpression14_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression14_es6.ts(3,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
 
 
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression14.ts (1 errors) ====
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression14_es6.ts (1 errors) ====
     class C {
       foo() {
          yield foo

tests/baselines/reference/YieldExpression15_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts(2,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression15_es6.ts(2,6): error TS1163: 'yield' expression must be contained_within a generator declaration.
 
 
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression15.ts (1 errors) ====
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression15_es6.ts (1 errors) ====
     var v = () => {
          yield foo
          ~~~~~

tests/baselines/reference/YieldExpression16_es6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts(3,5): error TS1163: 'yield' expression must be contained_within a generator declaration.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression16_es6.ts(3,5): error TS1163: 'yield' expression must be contained_within a generator declaration.
 
 
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression16.ts (1 errors) ====
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression16_es6.ts (1 errors) ====
     function* foo() {
       function bar() {
         yield foo;

tests/baselines/reference/YieldExpression17.errors.txt

@@ -1,10 +0,0 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts(1,15): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-
-
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression17.ts (2 errors) ====
-    var v = { get foo() { yield foo; } }
-                  ~~~
-!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
-                  ~~~
-!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.

tests/baselines/reference/YieldExpression17_es6.errors.txt

@@ -0,0 +1,10 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,15): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts(1,15): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression17_es6.ts (2 errors) ====
+    var v = { get foo() { yield foo; } }
+                  ~~~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+                  ~~~
+!!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.

tests/baselines/reference/YieldExpression18.errors.txt

@@ -1,8 +0,0 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts(2,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
-
-
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression18.ts (1 errors) ====
-    "use strict";
-    yield(foo);
-    ~~~~~
-!!! error TS1163: 'yield' expression must be contained_within a generator declaration.

tests/baselines/reference/YieldExpression18_es6.errors.txt

@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression18_es6.ts(2,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression18_es6.ts (1 errors) ====
+    "use strict";
+    yield(foo);
+    ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.

tests/baselines/reference/YieldExpression19_es6.js

@@ -1,4 +1,4 @@
-//// [YieldExpression19.ts]
+//// [YieldExpression19_es6.ts]
 function*foo() {
   function bar() {
     function* quux() {
@@ -7,7 +7,7 @@ function*foo() {
   }
 }
 
-//// [YieldExpression19.js]
+//// [YieldExpression19_es6.js]
 function foo() {
     function bar() {
         function quux() {

tests/baselines/reference/YieldExpression19_es6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/yieldExpressions/YieldExpression19.ts ===
+=== tests/cases/conformance/es6/yieldExpressions/YieldExpression19_es6.ts ===
 function*foo() {
 >foo : () => void
 

tests/baselines/reference/YieldExpression1_es6.errors.txt

@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression1_es6.ts(1,1): error TS2304: Cannot find name 'yield'.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression1_es6.ts (1 errors) ====
+    yield;
+    ~~~~~
+!!! error TS2304: Cannot find name 'yield'.

tests/baselines/reference/YieldExpression1_es6.js

@@ -0,0 +1,5 @@
+//// [YieldExpression1_es6.ts]
+yield;
+
+//// [YieldExpression1_es6.js]
+yield;

tests/baselines/reference/YieldExpression2.errors.txt

@@ -1,7 +0,0 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts(1,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
-
-
-==== tests/cases/conformance/es6/yieldExpressions/YieldExpression2.ts (1 errors) ====
-    yield foo;
-    ~~~~~
-!!! error TS1163: 'yield' expression must be contained_within a generator declaration.

tests/baselines/reference/YieldExpression2_es6.errors.txt

@@ -0,0 +1,7 @@
+tests/cases/conformance/es6/yieldExpressions/YieldExpression2_es6.ts(1,1): error TS1163: 'yield' expression must be contained_within a generator declaration.
+
+
+==== tests/cases/conformance/es6/yieldExpressions/YieldExpression2_es6.ts (1 errors) ====
+    yield foo;
+    ~~~~~
+!!! error TS1163: 'yield' expression must be contained_within a generator declaration.