fix: scope switch in repeat-until, emit break

thejustinwalsh · thejustinwalsh · commit 504fd1a6b190 · 2021-08-23T05:24:58.000-07:00
diff --git a/src/transformation/visitors/break-continue.ts b/src/transformation/visitors/break-continue.ts
@@ -8,7 +8,7 @@ import { findScope, ScopeType } from "../utils/scope";
 export const transformBreakStatement: FunctionVisitor<ts.BreakStatement> = (breakStatement, context) => {
     const breakableScope = findScope(context, ScopeType.Loop | ScopeType.Switch);
     if (breakableScope?.type === ScopeType.Switch) {
-        return undefined;
+        return lua.createBreakStatement(breakStatement);
     } else {
         return lua.createBreakStatement(breakStatement);
     }
diff --git a/src/transformation/visitors/switch.ts b/src/transformation/visitors/switch.ts
@@ -6,6 +6,7 @@ import { performHoisting, popScope, pushScope, ScopeType } from "../utils/scope"
 const containsBreakStatement = (statements: ts.Node[]): boolean => {
     for (const s of statements) {
         if (
+            ts.isIfStatement(s) ||
             ts.isSwitchStatement(s) ||
             ts.isWhileStatement(s) ||
             ts.isDoStatement(s) ||
@@ -85,5 +86,5 @@ export const transformSwitchStatement: FunctionVisitor<ts.SwitchStatement> = (st
     const expression = context.transformExpression(statement.expression);
     statements.unshift(lua.createVariableDeclarationStatement(switchVariable, expression));
 
-    return lua.createDoStatement(statements);
+    return lua.createRepeatStatement(lua.createBlock(statements), lua.createBooleanLiteral(true));
 };
diff --git a/test/unit/__snapshots__/switch.spec.ts.snap b/test/unit/__snapshots__/switch.spec.ts.snap
@@ -4,22 +4,25 @@ exports[`switch uses elseif 1`] = `
 "local ____exports = {}
 function ____exports.__main(self)
     local result = -1
-    do
+    repeat
         local ____switch3 = 2
         if ____switch3 == 0 then
             do
                 result = 200
+                break
             end
         elseif ____switch3 == 1 then
             do
                 result = 100
+                break
             end
         elseif ____switch3 == 2 then
             do
                 result = 1
+                break
             end
         end
-    end
+    until true
     return result
 end
 return ____exports"
diff --git a/test/unit/switch.spec.ts b/test/unit/switch.spec.ts
@@ -207,7 +207,7 @@ test.each([0, 1, 2, 3])("switchWithBrackets (%p)", inp => {
     `.expectToMatchJsResult();
 });
 
-test.each([0, 1, 2, 3])("switchWithBracketsBreakInConditional (%p)", inp => {
+test.each([0, 1, 2, 3, 4])("switchWithBracketsBreakInConditional (%p)", inp => {
     util.testFunction`
         let result: number = -1;
 
@@ -223,6 +223,11 @@ test.each([0, 1, 2, 3])("switchWithBracketsBreakInConditional (%p)", inp => {
             }
             case 2: {
                 result = 2;
+
+                if (result != 2) break;
+            }
+            case 3: {
+                result = 3;
                 break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { findScope, ScopeType } from "../utils/scope";`
`8`	`8`	`export const transformBreakStatement: FunctionVisitor<ts.BreakStatement> = (breakStatement, context) => {`
`9`	`9`	`const breakableScope = findScope(context, ScopeType.Loop \| ScopeType.Switch);`
`10`	`10`	`if (breakableScope?.type === ScopeType.Switch) {`
`11`		`- return undefined;`
	`11`	`+ return lua.createBreakStatement(breakStatement);`
`12`	`12`	`} else {`
`13`	`13`	`return lua.createBreakStatement(breakStatement);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ test.each([0, 1, 2, 3])("switchWithBrackets (%p)", inp => {`
`207`	`207`	`.expectToMatchJsResult();
`208`	`208`	`});`
`209`	`209`
`210`		`-test.each([0, 1, 2, 3])("switchWithBracketsBreakInConditional (%p)", inp => {`
	`210`	`+test.each([0, 1, 2, 3, 4])("switchWithBracketsBreakInConditional (%p)", inp => {`
`211`	`211`	util.testFunction`
`212`	`212`	`let result: number = -1;`
`213`	`213`
`@@ -223,6 +223,11 @@ test.each([0, 1, 2, 3])("switchWithBracketsBreakInConditional (%p)", inp => {`
`223`	`223`	`}`
`224`	`224`	`case 2: {`
`225`	`225`	`result = 2;`
	`226`	`+`
	`227`	`+ if (result != 2) break;`
	`228`	`+ }`
	`229`	`+ case 3: {`
	`230`	`+ result = 3;`
`226`	`231`	`break;`
`227`	`232`	`}`
`228`	`233`	`}`