Merge pull request #2706 from Microsoft/emitYieldStart

CyrusNajmabadi · CyrusNajmabadi · commit 1c7d8a2e212a · 2015-04-11T02:40:42.000-07:00
Emit generator functions and yield expressions in ES6.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7330,7 +7330,7 @@ module ts {
 
         function checkFunctionExpressionOrObjectLiteralMethodBody(node: FunctionExpression | MethodDeclaration) {
             Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
-            if (node.type) {
+            if (node.type && !node.asteriskToken) {
                 checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));
             }
 
@@ -8896,7 +8896,7 @@ module ts {
             }
 
             checkSourceElement(node.body);
-            if (node.type && !isAccessor(node.kind)) {
+            if (node.type && !isAccessor(node.kind) && !node.asteriskToken) {
                 checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));
             }
 
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1097,6 +1097,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
                                 default:
                                     return Comparison.LessThan;
                             }
+                        case SyntaxKind.YieldExpression:
                         case SyntaxKind.ConditionalExpression:
                             return Comparison.LessThan;
                         default:
@@ -1305,6 +1306,17 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 emit((<SpreadElementExpression>node).expression);
             }
 
+            function emitYieldExpression(node: YieldExpression) {
+                write(tokenToString(SyntaxKind.YieldKeyword));
+                if (node.asteriskToken) {
+                    write("*");
+                }
+                if (node.expression) {
+                    write(" ");
+                    emit(node.expression);
+                }
+            }
+
             function needsParenthesisForPropertyAccessOrInvocation(node: Expression) {
                 switch (node.kind) {
                     case SyntaxKind.Identifier:
@@ -1601,6 +1613,10 @@ var __param = this.__param || function(index, decorator) { return function (targ
             }
 
             function emitMethod(node: MethodDeclaration) {
+                if (languageVersion >= ScriptTarget.ES6 && node.asteriskToken) {
+                    write("*");
+                }
+
                 emit(node.name, /*allowGeneratedIdentifiers*/ false);
                 if (languageVersion < ScriptTarget.ES6) {
                     write(": function ");
@@ -2960,7 +2976,12 @@ var __param = this.__param || function(index, decorator) { return function (targ
                             write("default ");
                         }
                     }
-                    write("function ");
+
+                    write("function");
+                    if (languageVersion >= ScriptTarget.ES6 && node.asteriskToken) {
+                        write("*");
+                    }
+                    write(" ");
                 }
 
                 if (shouldEmitFunctionName(node)) {
@@ -3344,6 +3365,9 @@ var __param = this.__param || function(index, decorator) { return function (targ
                         else if (member.kind === SyntaxKind.SetAccessor) {
                             write("set ");
                         }
+                        if ((<MethodDeclaration>member).asteriskToken) {
+                            write("*");
+                        }
                         emit((<MethodDeclaration>member).name);
                         emitSignatureAndBody(<MethodDeclaration>member);
                         emitEnd(member);
@@ -4922,6 +4946,8 @@ var __param = this.__param || function(index, decorator) { return function (targ
                         return emitConditionalExpression(<ConditionalExpression>node);
                     case SyntaxKind.SpreadElementExpression:
                         return emitSpreadElementExpression(<SpreadElementExpression>node);
+                    case SyntaxKind.YieldExpression:
+                        return emitYieldExpression(<YieldExpression>node);
                     case SyntaxKind.OmittedExpression:
                         return;
                     case SyntaxKind.Block:
diff --git a/tests/baselines/reference/FunctionDeclaration9_es6.js b/tests/baselines/reference/FunctionDeclaration9_es6.js
@@ -5,6 +5,6 @@ function * foo() {
 
 //// [FunctionDeclaration9_es6.js]
 function foo() {
-    var v = (_a = {}, _a[] = foo, _a);
+    var v = (_a = {}, _a[yield] = foo, _a);
     var _a;
 }
diff --git a/tests/baselines/reference/YieldExpression10_es6.js b/tests/baselines/reference/YieldExpression10_es6.js
@@ -7,6 +7,6 @@ var v = { * foo() {
 
 //// [YieldExpression10_es6.js]
 var v = { foo: function () {
-        ;
+        yield (foo);
     }
 };
diff --git a/tests/baselines/reference/YieldExpression11_es6.js b/tests/baselines/reference/YieldExpression11_es6.js
@@ -10,7 +10,7 @@ var C = (function () {
     function C() {
     }
     C.prototype.foo = function () {
-        ;
+        yield (foo);
     };
     return C;
 })();
diff --git a/tests/baselines/reference/YieldExpression12_es6.js b/tests/baselines/reference/YieldExpression12_es6.js
@@ -8,7 +8,7 @@ class C {
 //// [YieldExpression12_es6.js]
 var C = (function () {
     function C() {
-        ;
+        yield foo;
     }
     return C;
 })();
diff --git a/tests/baselines/reference/YieldExpression13_es6.js b/tests/baselines/reference/YieldExpression13_es6.js
@@ -2,4 +2,4 @@
 function* foo() { yield }
 
 //// [YieldExpression13_es6.js]
-function foo() { ; }
+function foo() { yield; }
diff --git a/tests/baselines/reference/YieldExpression14_es6.js b/tests/baselines/reference/YieldExpression14_es6.js
@@ -10,7 +10,7 @@ var C = (function () {
     function C() {
     }
     C.prototype.foo = function () {
-        ;
+        yield foo;
     };
     return C;
 })();
diff --git a/tests/baselines/reference/YieldExpression15_es6.js b/tests/baselines/reference/YieldExpression15_es6.js
@@ -5,5 +5,5 @@ var v = () => {
 
 //// [YieldExpression15_es6.js]
 var v = function () {
-    ;
+    yield foo;
 };
diff --git a/tests/baselines/reference/YieldExpression16_es6.js b/tests/baselines/reference/YieldExpression16_es6.js
@@ -8,6 +8,6 @@ function* foo() {
 //// [YieldExpression16_es6.js]
 function foo() {
     function bar() {
-        ;
+        yield foo;
     }
 }
diff --git a/tests/baselines/reference/YieldExpression17_es6.js b/tests/baselines/reference/YieldExpression17_es6.js
@@ -2,4 +2,4 @@
 var v = { get foo() { yield foo; } }
 
 //// [YieldExpression17_es6.js]
-var v = { get foo() { ; } };
+var v = { get foo() { yield foo; } };
diff --git a/tests/baselines/reference/YieldExpression18_es6.js b/tests/baselines/reference/YieldExpression18_es6.js
@@ -4,4 +4,4 @@ yield(foo);
 
 //// [YieldExpression18_es6.js]
 "use strict";
-;
+yield (foo);
diff --git a/tests/baselines/reference/YieldExpression19_es6.js b/tests/baselines/reference/YieldExpression19_es6.js
@@ -11,7 +11,7 @@ function*foo() {
 function foo() {
     function bar() {
         function quux() {
-            ;
+            yield (foo);
         }
     }
 }
diff --git a/tests/baselines/reference/YieldExpression2_es6.js b/tests/baselines/reference/YieldExpression2_es6.js
@@ -2,4 +2,4 @@
 yield foo;
 
 //// [YieldExpression2_es6.js]
-;
+yield foo;
diff --git a/tests/baselines/reference/YieldExpression3_es6.js b/tests/baselines/reference/YieldExpression3_es6.js
@@ -6,6 +6,6 @@ function* foo() {
 
 //// [YieldExpression3_es6.js]
 function foo() {
-    ;
-    ;
+    yield;
+    yield;
 }
diff --git a/tests/baselines/reference/YieldExpression4_es6.js b/tests/baselines/reference/YieldExpression4_es6.js
@@ -6,6 +6,6 @@ function* foo() {
 
 //// [YieldExpression4_es6.js]
 function foo() {
-    ;
-    ;
+    yield;
+    yield;
 }
diff --git a/tests/baselines/reference/YieldExpression5_es6.js b/tests/baselines/reference/YieldExpression5_es6.js
@@ -5,5 +5,5 @@ function* foo() {
 
 //// [YieldExpression5_es6.js]
 function foo() {
-    ;
+    yield* ;
 }
diff --git a/tests/baselines/reference/YieldExpression6_es6.js b/tests/baselines/reference/YieldExpression6_es6.js
@@ -5,5 +5,5 @@ function* foo() {
 
 //// [YieldExpression6_es6.js]
 function foo() {
-    ;
+    yield* foo;
 }
diff --git a/tests/baselines/reference/YieldExpression7_es6.js b/tests/baselines/reference/YieldExpression7_es6.js
@@ -5,5 +5,5 @@ function* foo() {
 
 //// [YieldExpression7_es6.js]
 function foo() {
-    ;
+    yield foo;
 }
diff --git a/tests/baselines/reference/YieldExpression8_es6.js b/tests/baselines/reference/YieldExpression8_es6.js
@@ -7,5 +7,5 @@ function* foo() {
 //// [YieldExpression8_es6.js]
 yield(foo);
 function foo() {
-    ;
+    yield (foo);
 }
diff --git a/tests/baselines/reference/YieldExpression9_es6.js b/tests/baselines/reference/YieldExpression9_es6.js
@@ -5,5 +5,5 @@ var v = function*() {
 
 //// [YieldExpression9_es6.js]
 var v = function () {
-    ;
+    yield (foo);
 };
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -486,7 +486,7 @@ number;
 }
 var CLASS = (function () {
     function CLASS() {
-        this.d = function () { ; };
+        this.d = function () { yield 0; };
     }
     Object.defineProperty(CLASS.prototype, "Property", {
         get: function () { return 0; },
diff --git a/tests/baselines/reference/generatorES6_1.errors.txt b/tests/baselines/reference/generatorES6_1.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/generatorES6_1.ts(1,9): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_1.ts(2,5): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_1.ts (2 errors) ====
+    function* foo() {
+            ~
+!!! error TS9001: Generators are not currently supported.
+        yield
+        ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+    }
diff --git a/tests/baselines/reference/generatorES6_1.js b/tests/baselines/reference/generatorES6_1.js
@@ -0,0 +1,9 @@
+//// [generatorES6_1.ts]
+function* foo() {
+    yield
+}
+
+//// [generatorES6_1.js]
+function* foo() {
+    yield;
+}
diff --git a/tests/baselines/reference/generatorES6_2.errors.txt b/tests/baselines/reference/generatorES6_2.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/generatorES6_2.ts(2,12): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_2.ts(3,9): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_2.ts (2 errors) ====
+    class C {
+        public * foo() {
+               ~
+!!! error TS9001: Generators are not currently supported.
+            yield 1
+            ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+        }
+    }
diff --git a/tests/baselines/reference/generatorES6_2.js b/tests/baselines/reference/generatorES6_2.js
@@ -0,0 +1,13 @@
+//// [generatorES6_2.ts]
+class C {
+    public * foo() {
+        yield 1
+    }
+}
+
+//// [generatorES6_2.js]
+class C {
+    *foo() {
+        yield 1;
+    }
+}
diff --git a/tests/baselines/reference/generatorES6_3.errors.txt b/tests/baselines/reference/generatorES6_3.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/generatorES6_3.ts(1,17): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_3.ts(2,5): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_3.ts (2 errors) ====
+    var v = function*() {
+                    ~
+!!! error TS9001: Generators are not currently supported.
+        yield 0
+        ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+    }
diff --git a/tests/baselines/reference/generatorES6_3.js b/tests/baselines/reference/generatorES6_3.js
@@ -0,0 +1,9 @@
+//// [generatorES6_3.ts]
+var v = function*() {
+    yield 0
+}
+
+//// [generatorES6_3.js]
+var v = function* () {
+    yield 0;
+};
diff --git a/tests/baselines/reference/generatorES6_4.errors.txt b/tests/baselines/reference/generatorES6_4.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/generatorES6_4.ts(2,4): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_4.ts(3,8): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_4.ts (2 errors) ====
+    var v = { 
+       *foo() {
+       ~
+!!! error TS9001: Generators are not currently supported.
+           yield 0
+           ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+       }
+    }
diff --git a/tests/baselines/reference/generatorES6_4.js b/tests/baselines/reference/generatorES6_4.js
@@ -0,0 +1,13 @@
+//// [generatorES6_4.ts]
+var v = { 
+   *foo() {
+       yield 0
+   }
+}
+
+//// [generatorES6_4.js]
+var v = {
+    *foo() {
+        yield 0;
+    }
+};
diff --git a/tests/baselines/reference/generatorES6_5.errors.txt b/tests/baselines/reference/generatorES6_5.errors.txt
@@ -0,0 +1,12 @@
+tests/cases/compiler/generatorES6_5.ts(1,9): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_5.ts(2,5): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_5.ts (2 errors) ====
+    function* foo() {
+            ~
+!!! error TS9001: Generators are not currently supported.
+        yield a ? b : c;
+        ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+    }
diff --git a/tests/baselines/reference/generatorES6_5.js b/tests/baselines/reference/generatorES6_5.js
@@ -0,0 +1,9 @@
+//// [generatorES6_5.ts]
+function* foo() {
+    yield a ? b : c;
+}
+
+//// [generatorES6_5.js]
+function* foo() {
+    yield a ? b : c;
+}
diff --git a/tests/baselines/reference/generatorES6_6.errors.txt b/tests/baselines/reference/generatorES6_6.errors.txt
@@ -0,0 +1,14 @@
+tests/cases/compiler/generatorES6_6.ts(2,3): error TS9001: Generators are not currently supported.
+tests/cases/compiler/generatorES6_6.ts(3,13): error TS9000: 'yield' expressions are not currently supported.
+
+
+==== tests/cases/compiler/generatorES6_6.ts (2 errors) ====
+    class C {
+      *[Symbol.iterator]() {
+      ~
+!!! error TS9001: Generators are not currently supported.
+        let a = yield 1;
+                ~~~~~
+!!! error TS9000: 'yield' expressions are not currently supported.
+      }
+    }
diff --git a/tests/baselines/reference/generatorES6_6.js b/tests/baselines/reference/generatorES6_6.js
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.js b/tests/baselines/reference/templateStringInYieldKeyword.js
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js b/tests/baselines/reference/templateStringWithEmbeddedYieldKeyword.js
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.js b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.js
diff --git a/tests/baselines/reference/yieldExpression1.js b/tests/baselines/reference/yieldExpression1.js
diff --git a/tests/cases/compiler/generatorES6_1.ts b/tests/cases/compiler/generatorES6_1.ts
diff --git a/tests/cases/compiler/generatorES6_2.ts b/tests/cases/compiler/generatorES6_2.ts
diff --git a/tests/cases/compiler/generatorES6_3.ts b/tests/cases/compiler/generatorES6_3.ts
diff --git a/tests/cases/compiler/generatorES6_4.ts b/tests/cases/compiler/generatorES6_4.ts
diff --git a/tests/cases/compiler/generatorES6_5.ts b/tests/cases/compiler/generatorES6_5.ts
diff --git a/tests/cases/compiler/generatorES6_6.ts b/tests/cases/compiler/generatorES6_6.ts

Original file line number	Diff line number	Diff line change
`@@ -7330,7 +7330,7 @@ module ts {`
`7330`	`7330`
`7331`	`7331`	`function checkFunctionExpressionOrObjectLiteralMethodBody(node: FunctionExpression \| MethodDeclaration) {`
`7332`	`7332`	`Debug.assert(node.kind !== SyntaxKind.MethodDeclaration \|\| isObjectLiteralMethod(node));`
`7333`		`- if (node.type) {`
	`7333`	`+ if (node.type && !node.asteriskToken) {`
`7334`	`7334`	`checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));`
`7335`	`7335`	`}`
`7336`	`7336`
`@@ -8896,7 +8896,7 @@ module ts {`
`8896`	`8896`	`}`
`8897`	`8897`
`8898`	`8898`	`checkSourceElement(node.body);`
`8899`		`- if (node.type && !isAccessor(node.kind)) {`
	`8899`	`+ if (node.type && !isAccessor(node.kind) && !node.asteriskToken) {`
`8900`	`8900`	`checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNodeOrHeritageClauseElement(node.type));`
`8901`	`8901`	`}`
`8902`	`8902`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ function * foo() {`
`5`	`5`
`6`	`6`	`//// [FunctionDeclaration9_es6.js]`
`7`	`7`	`function foo() {`
`8`		`- var v = (_a = {}, _a[] = foo, _a);`
	`8`	`+ var v = (_a = {}, _a[yield] = foo, _a);`
`9`	`9`	`var _a;`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ var v = { * foo() {`
`7`	`7`
`8`	`8`	`//// [YieldExpression10_es6.js]`
`9`	`9`	`var v = { foo: function () {`
`10`		`- ;`
	`10`	`+ yield (foo);`
`11`	`11`	`}`
`12`	`12`	`};`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ var C = (function () {`
`10`	`10`	`function C() {`
`11`	`11`	`}`
`12`	`12`	`C.prototype.foo = function () {`
`13`		`- ;`
	`13`	`+ yield (foo);`
`14`	`14`	`};`
`15`	`15`	`return C;`
`16`	`16`	`})();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class C {`
`8`	`8`	`//// [YieldExpression12_es6.js]`
`9`	`9`	`var C = (function () {`
`10`	`10`	`function C() {`
`11`		`- ;`
	`11`	`+ yield foo;`
`12`	`12`	`}`
`13`	`13`	`return C;`
`14`	`14`	`})();`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ function* foo() {`
`8`	`8`	`//// [YieldExpression16_es6.js]`
`9`	`9`	`function foo() {`
`10`	`10`	`function bar() {`
`11`		`- ;`
	`11`	`+ yield foo;`
`12`	`12`	`}`
`13`	`13`	`}`