Merge pull request microsoft#6827 from T18970237136/ts-missing-semicolon

DanielRosenwasser · DanielRosenwasser · commit c6588d27f18f · 2016-02-02T10:53:46.000-08:00
Add missing semicolon when emitting return statement.
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -3162,7 +3162,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         }
                         else {
                             // top level converted loop - return unwrapped value
-                            write(`return ${loopResult}.value`);
+                            write(`return ${loopResult}.value;`);
                         }
                         writeLine();
                     }
diff --git a/tests/baselines/reference/capturedLetConstInLoop11.js b/tests/baselines/reference/capturedLetConstInLoop11.js
@@ -30,6 +30,6 @@ function foo() {
     };
     for (;;) {
         var state_2 = _loop_2();
-        if (typeof state_2 === "object") return state_2.value
+        if (typeof state_2 === "object") return state_2.value;
     }
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop5.js b/tests/baselines/reference/capturedLetConstInLoop5.js
@@ -294,7 +294,7 @@ function foo0(x) {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
         var x_1 = _a[_i];
         var state_1 = _loop_1(x_1);
-        if (typeof state_1 === "object") return state_1.value
+        if (typeof state_1 === "object") return state_1.value;
     }
     use(v);
 }
@@ -310,7 +310,7 @@ function foo00(x) {
     var v;
     for (var x_2 in []) {
         var state_2 = _loop_2(x_2);
-        if (typeof state_2 === "object") return state_2.value
+        if (typeof state_2 === "object") return state_2.value;
     }
     use(v);
 }
@@ -326,7 +326,7 @@ function foo1(x) {
     var v;
     for (var x_3 = 0; x_3 < 1; ++x_3) {
         var state_3 = _loop_3(x_3);
-        if (typeof state_3 === "object") return state_3.value
+        if (typeof state_3 === "object") return state_3.value;
     }
     use(v);
 }
@@ -343,7 +343,7 @@ function foo2(x) {
     var v;
     while (1 === 1) {
         var state_4 = _loop_4();
-        if (typeof state_4 === "object") return state_4.value
+        if (typeof state_4 === "object") return state_4.value;
     }
     use(v);
 }
@@ -359,7 +359,7 @@ function foo3(x) {
     var v;
     do {
         var state_5 = _loop_5();
-        if (typeof state_5 === "object") return state_5.value
+        if (typeof state_5 === "object") return state_5.value;
     } while (1 === 1);
     use(v);
 }
@@ -376,7 +376,7 @@ function foo4(x) {
     var v;
     for (var y = 0; y < 1; ++y) {
         var state_6 = _loop_6(y);
-        if (typeof state_6 === "object") return state_6.value
+        if (typeof state_6 === "object") return state_6.value;
     }
     use(v);
 }
@@ -392,7 +392,7 @@ function foo5(x) {
     var v;
     for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {
         var state_7 = _loop_7(x_7, y);
-        if (typeof state_7 === "object") return state_7.value
+        if (typeof state_7 === "object") return state_7.value;
     }
     use(v);
 }
@@ -409,7 +409,7 @@ function foo6(x) {
     var v;
     while (1 === 1) {
         var state_8 = _loop_8();
-        if (typeof state_8 === "object") return state_8.value
+        if (typeof state_8 === "object") return state_8.value;
     }
     ;
     use(v);
@@ -427,7 +427,7 @@ function foo7(x) {
     var v;
     do {
         var state_9 = _loop_9();
-        if (typeof state_9 === "object") return state_9.value
+        if (typeof state_9 === "object") return state_9.value;
     } while (1 === 1);
     use(v);
 }
@@ -444,7 +444,7 @@ function foo8(x) {
     var v;
     for (var y = 0; y < 1; ++y) {
         var state_10 = _loop_10(y);
-        if (typeof state_10 === "object") return state_10.value
+        if (typeof state_10 === "object") return state_10.value;
     }
     use(v);
 }
@@ -462,7 +462,7 @@ function foo0_c(x) {
     for (var _i = 0, _a = []; _i < _a.length; _i++) {
         var x_11 = _a[_i];
         var state_11 = _loop_11(x_11);
-        if (typeof state_11 === "object") return state_11.value
+        if (typeof state_11 === "object") return state_11.value;
     }
     use(v);
 }
@@ -478,7 +478,7 @@ function foo00_c(x) {
     var v;
     for (var x_12 in []) {
         var state_12 = _loop_12(x_12);
-        if (typeof state_12 === "object") return state_12.value
+        if (typeof state_12 === "object") return state_12.value;
     }
     use(v);
 }
@@ -494,7 +494,7 @@ function foo1_c(x) {
     var v;
     for (var x_13 = 0; x_13 < 1;) {
         var state_13 = _loop_13(x_13);
-        if (typeof state_13 === "object") return state_13.value
+        if (typeof state_13 === "object") return state_13.value;
     }
     use(v);
 }
@@ -511,7 +511,7 @@ function foo2_c(x) {
     var v;
     while (1 === 1) {
         var state_14 = _loop_14();
-        if (typeof state_14 === "object") return state_14.value
+        if (typeof state_14 === "object") return state_14.value;
     }
     use(v);
 }
@@ -527,7 +527,7 @@ function foo3_c(x) {
     var v;
     do {
         var state_15 = _loop_15();
-        if (typeof state_15 === "object") return state_15.value
+        if (typeof state_15 === "object") return state_15.value;
     } while (1 === 1);
     use(v);
 }
@@ -544,7 +544,7 @@ function foo4_c(x) {
     var v;
     for (var y = 0; y < 1;) {
         var state_16 = _loop_16(y);
-        if (typeof state_16 === "object") return state_16.value
+        if (typeof state_16 === "object") return state_16.value;
     }
     use(v);
 }
@@ -560,7 +560,7 @@ function foo5_c(x) {
     var v;
     for (var x_17 = 0, y = 1; x_17 < 1;) {
         var state_17 = _loop_17(x_17, y);
-        if (typeof state_17 === "object") return state_17.value
+        if (typeof state_17 === "object") return state_17.value;
     }
     use(v);
 }
@@ -577,7 +577,7 @@ function foo6_c(x) {
     var v;
     while (1 === 1) {
         var state_18 = _loop_18();
-        if (typeof state_18 === "object") return state_18.value
+        if (typeof state_18 === "object") return state_18.value;
     }
     use(v);
 }
@@ -594,7 +594,7 @@ function foo7_c(x) {
     var v;
     do {
         var state_19 = _loop_19();
-        if (typeof state_19 === "object") return state_19.value
+        if (typeof state_19 === "object") return state_19.value;
     } while (1 === 1);
     use(v);
 }
@@ -611,7 +611,7 @@ function foo8_c(x) {
     var v;
     for (var y = 0; y < 1;) {
         var state_20 = _loop_20(y);
-        if (typeof state_20 === "object") return state_20.value
+        if (typeof state_20 === "object") return state_20.value;
     }
     use(v);
 }
diff --git a/tests/baselines/reference/capturedLetConstInLoop8.js b/tests/baselines/reference/capturedLetConstInLoop8.js
@@ -198,7 +198,7 @@ function foo() {
         };
         l1: for (var x = 0; x < 1; ++x) {
             var state_2 = _loop_1(x);
-            if (typeof state_2 === "object") return state_2.value
+            if (typeof state_2 === "object") return state_2.value;
             if (state_2 === "break") break;
             if (state_2 === "continue") continue;
             switch(state_2) {
@@ -280,7 +280,7 @@ function foo_c() {
         };
         l1: for (var x = 0; x < 1;) {
             var state_4 = _loop_3(x);
-            if (typeof state_4 === "object") return state_4.value
+            if (typeof state_4 === "object") return state_4.value;
             if (state_4 === "break") break;
             if (state_4 === "continue") continue;
             switch(state_4) {
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js
@@ -225,7 +225,7 @@ function foo() {
     l0: for (var _f = 0, _g = []; _f < _g.length; _f++) {
         var a = _g[_f];
         var state_4 = _loop_3(a);
-        if (typeof state_4 === "object") return state_4.value
+        if (typeof state_4 === "object") return state_4.value;
         if (state_4 === "break") break;
         switch(state_4) {
             case "break-l0": break l0;

Original file line number	Diff line number	Diff line change
`@@ -3162,7 +3162,7 @@ var __awaiter = (this && this.__awaiter) \|\| function (thisArg, _arguments, P, ge`
`3162`	`3162`	`}`
`3163`	`3163`	`else {`
`3164`	`3164`	`// top level converted loop - return unwrapped value`
`3165`		- write(`return ${loopResult}.value`);
	`3165`	+ write(`return ${loopResult}.value;`);
`3166`	`3166`	`}`
`3167`	`3167`	`writeLine();`
`3168`	`3168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ function foo() {`
`30`	`30`	`};`
`31`	`31`	`for (;;) {`
`32`	`32`	`var state_2 = _loop_2();`
`33`		`- if (typeof state_2 === "object") return state_2.value`
	`33`	`+ if (typeof state_2 === "object") return state_2.value;`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ function foo0(x) {`
`294`	`294`	`for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`295`	`295`	`var x_1 = _a[_i];`
`296`	`296`	`var state_1 = _loop_1(x_1);`
`297`		`- if (typeof state_1 === "object") return state_1.value`
	`297`	`+ if (typeof state_1 === "object") return state_1.value;`
`298`	`298`	`}`
`299`	`299`	`use(v);`
`300`	`300`	`}`
`@@ -310,7 +310,7 @@ function foo00(x) {`
`310`	`310`	`var v;`
`311`	`311`	`for (var x_2 in []) {`
`312`	`312`	`var state_2 = _loop_2(x_2);`
`313`		`- if (typeof state_2 === "object") return state_2.value`
	`313`	`+ if (typeof state_2 === "object") return state_2.value;`
`314`	`314`	`}`
`315`	`315`	`use(v);`
`316`	`316`	`}`
`@@ -326,7 +326,7 @@ function foo1(x) {`
`326`	`326`	`var v;`
`327`	`327`	`for (var x_3 = 0; x_3 < 1; ++x_3) {`
`328`	`328`	`var state_3 = _loop_3(x_3);`
`329`		`- if (typeof state_3 === "object") return state_3.value`
	`329`	`+ if (typeof state_3 === "object") return state_3.value;`
`330`	`330`	`}`
`331`	`331`	`use(v);`
`332`	`332`	`}`
`@@ -343,7 +343,7 @@ function foo2(x) {`
`343`	`343`	`var v;`
`344`	`344`	`while (1 === 1) {`
`345`	`345`	`var state_4 = _loop_4();`
`346`		`- if (typeof state_4 === "object") return state_4.value`
	`346`	`+ if (typeof state_4 === "object") return state_4.value;`
`347`	`347`	`}`
`348`	`348`	`use(v);`
`349`	`349`	`}`
`@@ -359,7 +359,7 @@ function foo3(x) {`
`359`	`359`	`var v;`
`360`	`360`	`do {`
`361`	`361`	`var state_5 = _loop_5();`
`362`		`- if (typeof state_5 === "object") return state_5.value`
	`362`	`+ if (typeof state_5 === "object") return state_5.value;`
`363`	`363`	`} while (1 === 1);`
`364`	`364`	`use(v);`
`365`	`365`	`}`
`@@ -376,7 +376,7 @@ function foo4(x) {`
`376`	`376`	`var v;`
`377`	`377`	`for (var y = 0; y < 1; ++y) {`
`378`	`378`	`var state_6 = _loop_6(y);`
`379`		`- if (typeof state_6 === "object") return state_6.value`
	`379`	`+ if (typeof state_6 === "object") return state_6.value;`
`380`	`380`	`}`
`381`	`381`	`use(v);`
`382`	`382`	`}`
`@@ -392,7 +392,7 @@ function foo5(x) {`
`392`	`392`	`var v;`
`393`	`393`	`for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) {`
`394`	`394`	`var state_7 = _loop_7(x_7, y);`
`395`		`- if (typeof state_7 === "object") return state_7.value`
	`395`	`+ if (typeof state_7 === "object") return state_7.value;`
`396`	`396`	`}`
`397`	`397`	`use(v);`
`398`	`398`	`}`
`@@ -409,7 +409,7 @@ function foo6(x) {`
`409`	`409`	`var v;`
`410`	`410`	`while (1 === 1) {`
`411`	`411`	`var state_8 = _loop_8();`
`412`		`- if (typeof state_8 === "object") return state_8.value`
	`412`	`+ if (typeof state_8 === "object") return state_8.value;`
`413`	`413`	`}`
`414`	`414`	`;`
`415`	`415`	`use(v);`
`@@ -427,7 +427,7 @@ function foo7(x) {`
`427`	`427`	`var v;`
`428`	`428`	`do {`
`429`	`429`	`var state_9 = _loop_9();`
`430`		`- if (typeof state_9 === "object") return state_9.value`
	`430`	`+ if (typeof state_9 === "object") return state_9.value;`
`431`	`431`	`} while (1 === 1);`
`432`	`432`	`use(v);`
`433`	`433`	`}`
`@@ -444,7 +444,7 @@ function foo8(x) {`
`444`	`444`	`var v;`
`445`	`445`	`for (var y = 0; y < 1; ++y) {`
`446`	`446`	`var state_10 = _loop_10(y);`
`447`		`- if (typeof state_10 === "object") return state_10.value`
	`447`	`+ if (typeof state_10 === "object") return state_10.value;`
`448`	`448`	`}`
`449`	`449`	`use(v);`
`450`	`450`	`}`
`@@ -462,7 +462,7 @@ function foo0_c(x) {`
`462`	`462`	`for (var _i = 0, _a = []; _i < _a.length; _i++) {`
`463`	`463`	`var x_11 = _a[_i];`
`464`	`464`	`var state_11 = _loop_11(x_11);`
`465`		`- if (typeof state_11 === "object") return state_11.value`
	`465`	`+ if (typeof state_11 === "object") return state_11.value;`
`466`	`466`	`}`
`467`	`467`	`use(v);`
`468`	`468`	`}`
`@@ -478,7 +478,7 @@ function foo00_c(x) {`
`478`	`478`	`var v;`
`479`	`479`	`for (var x_12 in []) {`
`480`	`480`	`var state_12 = _loop_12(x_12);`
`481`		`- if (typeof state_12 === "object") return state_12.value`
	`481`	`+ if (typeof state_12 === "object") return state_12.value;`
`482`	`482`	`}`
`483`	`483`	`use(v);`
`484`	`484`	`}`
`@@ -494,7 +494,7 @@ function foo1_c(x) {`
`494`	`494`	`var v;`
`495`	`495`	`for (var x_13 = 0; x_13 < 1;) {`
`496`	`496`	`var state_13 = _loop_13(x_13);`
`497`		`- if (typeof state_13 === "object") return state_13.value`
	`497`	`+ if (typeof state_13 === "object") return state_13.value;`
`498`	`498`	`}`
`499`	`499`	`use(v);`
`500`	`500`	`}`
`@@ -511,7 +511,7 @@ function foo2_c(x) {`
`511`	`511`	`var v;`
`512`	`512`	`while (1 === 1) {`
`513`	`513`	`var state_14 = _loop_14();`
`514`		`- if (typeof state_14 === "object") return state_14.value`
	`514`	`+ if (typeof state_14 === "object") return state_14.value;`
`515`	`515`	`}`
`516`	`516`	`use(v);`
`517`	`517`	`}`
`@@ -527,7 +527,7 @@ function foo3_c(x) {`
`527`	`527`	`var v;`
`528`	`528`	`do {`
`529`	`529`	`var state_15 = _loop_15();`
`530`		`- if (typeof state_15 === "object") return state_15.value`
	`530`	`+ if (typeof state_15 === "object") return state_15.value;`
`531`	`531`	`} while (1 === 1);`
`532`	`532`	`use(v);`
`533`	`533`	`}`
`@@ -544,7 +544,7 @@ function foo4_c(x) {`
`544`	`544`	`var v;`
`545`	`545`	`for (var y = 0; y < 1;) {`
`546`	`546`	`var state_16 = _loop_16(y);`
`547`		`- if (typeof state_16 === "object") return state_16.value`
	`547`	`+ if (typeof state_16 === "object") return state_16.value;`
`548`	`548`	`}`
`549`	`549`	`use(v);`
`550`	`550`	`}`
`@@ -560,7 +560,7 @@ function foo5_c(x) {`
`560`	`560`	`var v;`
`561`	`561`	`for (var x_17 = 0, y = 1; x_17 < 1;) {`
`562`	`562`	`var state_17 = _loop_17(x_17, y);`
`563`		`- if (typeof state_17 === "object") return state_17.value`
	`563`	`+ if (typeof state_17 === "object") return state_17.value;`
`564`	`564`	`}`
`565`	`565`	`use(v);`
`566`	`566`	`}`
`@@ -577,7 +577,7 @@ function foo6_c(x) {`
`577`	`577`	`var v;`
`578`	`578`	`while (1 === 1) {`
`579`	`579`	`var state_18 = _loop_18();`
`580`		`- if (typeof state_18 === "object") return state_18.value`
	`580`	`+ if (typeof state_18 === "object") return state_18.value;`
`581`	`581`	`}`
`582`	`582`	`use(v);`
`583`	`583`	`}`
`@@ -594,7 +594,7 @@ function foo7_c(x) {`
`594`	`594`	`var v;`
`595`	`595`	`do {`
`596`	`596`	`var state_19 = _loop_19();`
`597`		`- if (typeof state_19 === "object") return state_19.value`
	`597`	`+ if (typeof state_19 === "object") return state_19.value;`
`598`	`598`	`} while (1 === 1);`
`599`	`599`	`use(v);`
`600`	`600`	`}`
`@@ -611,7 +611,7 @@ function foo8_c(x) {`
`611`	`611`	`var v;`
`612`	`612`	`for (var y = 0; y < 1;) {`
`613`	`613`	`var state_20 = _loop_20(y);`
`614`		`- if (typeof state_20 === "object") return state_20.value`
	`614`	`+ if (typeof state_20 === "object") return state_20.value;`
`615`	`615`	`}`
`616`	`616`	`use(v);`
`617`	`617`	`}`