Move transformLoopBody to the new utils file

ark120202 · ark120202 · commit b548a732040a · 2019-12-09T15:36:18.000Z
diff --git a/src/transformation/visitors/loops/body.ts b/src/transformation/visitors/loops/body.ts
diff --git a/src/transformation/visitors/loops/do-while.ts b/src/transformation/visitors/loops/do-while.ts
@@ -1,7 +1,7 @@
 import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
 import { FunctionVisitor } from "../../context";
-import { transformLoopBody } from "./body";
+import { transformLoopBody } from "./utils";
 
 export const transformWhileStatement: FunctionVisitor<ts.WhileStatement> = (statement, context) => {
     return lua.createWhileStatement(
diff --git a/src/transformation/visitors/loops/for-in.ts b/src/transformation/visitors/loops/for-in.ts
@@ -4,8 +4,7 @@ import { FunctionVisitor } from "../../context";
 import { ForbiddenForIn, UnsupportedForInVariable } from "../../utils/errors";
 import { isArrayType } from "../../utils/typescript";
 import { transformIdentifier } from "../identifier";
-import { transformLoopBody } from "./body";
-import { getVariableDeclarationBinding } from "./utils";
+import { getVariableDeclarationBinding, transformLoopBody } from "./utils";
 
 export const transformForInStatement: FunctionVisitor<ts.ForInStatement> = (statement, context) => {
     if (isArrayType(context, context.checker.getTypeAtLocation(statement.expression))) {
diff --git a/src/transformation/visitors/loops/for-of.ts b/src/transformation/visitors/loops/for-of.ts
@@ -3,20 +3,14 @@ import * as lua from "../../../LuaAST";
 import { cast, castEach } from "../../../utils";
 import { FunctionVisitor, TransformationContext } from "../../context";
 import { AnnotationKind, getTypeAnnotations, isForRangeType, isLuaIteratorType } from "../../utils/annotations";
-import {
-    InvalidForRangeCall,
-    MissingForOfVariables,
-    UnsupportedNonDestructuringLuaIterator,
-    UnsupportedObjectDestructuringInForOf,
-} from "../../utils/errors";
+import { InvalidForRangeCall, MissingForOfVariables, UnsupportedNonDestructuringLuaIterator, UnsupportedObjectDestructuringInForOf } from "../../utils/errors";
 import { createUnpackCall } from "../../utils/lua-ast";
 import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
 import { isArrayType, isNumberType } from "../../utils/typescript";
 import { transformArguments } from "../call";
 import { transformIdentifier } from "../identifier";
 import { transformArrayBindingElement, transformVariableDeclaration } from "../variable-declaration";
-import { transformLoopBody } from "./body";
-import { getVariableDeclarationBinding } from "./utils";
+import { getVariableDeclarationBinding, transformLoopBody } from "./utils";
 
 function transformForOfInitializer(
     context: TransformationContext,
diff --git a/src/transformation/visitors/loops/for.ts b/src/transformation/visitors/loops/for.ts
@@ -3,7 +3,7 @@ import * as lua from "../../../LuaAST";
 import { flatMap } from "../../../utils";
 import { FunctionVisitor } from "../../context";
 import { checkVariableDeclarationList, transformVariableDeclaration } from "../variable-declaration";
-import { transformLoopBody } from "./body";
+import { transformLoopBody } from "./utils";
 
 export const transformForStatement: FunctionVisitor<ts.ForStatement> = (statement, context) => {
     const result: lua.Statement[] = [];
diff --git a/src/transformation/visitors/loops/utils.ts b/src/transformation/visitors/loops/utils.ts
@@ -1,6 +1,31 @@
 import * as ts from "typescript";
+import * as lua from "../../../LuaAST";
+import { TransformationContext } from "../../context";
+import { performHoisting, popScope, pushScope, ScopeType } from "../../utils/scope";
+import { transformBlockOrStatement } from "../block";
 import { checkVariableDeclarationList } from "../variable-declaration";
 
+
+export function transformLoopBody(
+    context: TransformationContext,
+    loop: ts.WhileStatement | ts.DoStatement | ts.ForStatement | ts.ForOfStatement | ts.ForInOrOfStatement
+): lua.Statement[] {
+    pushScope(context, ScopeType.Loop);
+    const body = performHoisting(context, transformBlockOrStatement(context, loop.statement));
+    const scope = popScope(context);
+    const scopeId = scope.id;
+
+    if (!scope.loopContinued) {
+        return body;
+    }
+
+    const baseResult: lua.Statement[] = [lua.createDoStatement(body)];
+    const continueLabel = lua.createLabelStatement(`__continue${scopeId}`);
+    baseResult.push(continueLabel);
+
+    return baseResult;
+}
+
 export function getVariableDeclarationBinding(node: ts.VariableDeclarationList): ts.BindingName {
     checkVariableDeclarationList(node);
 
