TypeScriptToLua
diff --git a/‎Transpiler.ts‎
Lines changed: 41 additions & 4 deletions b/‎Transpiler.ts‎
Lines changed: 41 additions & 4 deletions
diff --git a/‎test/test2.ts‎
Lines changed: 10 additions & 3 deletions b/‎test/test2.ts‎
Lines changed: 10 additions & 3 deletions
@@ -44,7 +44,11 @@ export class LuaTranspiler {
             case ts.SyntaxKind.ReturnStatement:
                 return indent + this.transpileReturn(<ts.ReturnStatement>node) + "\n";
             case ts.SyntaxKind.ForStatement:
-                return this.transpileFor(<ts.ForStatement>node, indent) + "\n";
+                return this.transpileFor(<ts.ForStatement>node, indent);
+            case ts.SyntaxKind.ForOfStatement:
+                return this.transpileForOf(<ts.ForOfStatement>node, indent);
+            case ts.SyntaxKind.ForInStatement:
+                return this.transpileForIn(<ts.ForInStatement>node, indent);
             case ts.SyntaxKind.EndOfFileToken:
                 return "";
             default:
@@ -142,14 +146,47 @@ export class LuaTranspiler {
         let result = indent + `for ${identifier.escapedText}=${start},${end},${step} do\n`;
 
         // Add body
-        const block = tsEx.getFirstChildOfType<ts.Block>(node, ts.isBlock);
-        result += this.transpileBlock(block, indent + "    ");
+        result += this.transpileBlock(node.statement, indent + "    ");
+
+        return result + indent + "end\n";
+    }
+
+    static transpileForOf(node: ts.ForOfStatement, indent: string): string {
+        // Get variable identifier
+        const variable = <ts.VariableDeclaration>(<ts.VariableDeclarationList>node.initializer).declarations[0];
+        const identifier = <ts.Identifier>variable.name;
+
+        // Transpile expression
+        const expression = this.transpileExpression(node.expression);
+
+        // Make header
+        let result = indent + `for _, ${identifier.escapedText} in pairs(${expression}) do\n`;
+
+        // For body
+        result += this.transpileBlock(node.statement, indent + "    ");
+
+        return result + indent + "end\n";
+    }
+
+    static transpileForIn(node: ts.ForInStatement, indent: string): string {
+        // Get variable identifier
+        const variable = <ts.VariableDeclaration>(<ts.VariableDeclarationList>node.initializer).declarations[0];
+        const identifier = <ts.Identifier>variable.name;
+
+        // Transpile expression
+        const expression = this.transpileExpression(node.expression);
+
+        // Make header
+        let result = indent + `for ${identifier.escapedText}, _ in pairs(${expression}) do\n`;
+
+        // For body
+        result += this.transpileBlock(node.statement, indent + "    ");
 
         return result + indent + "end\n";
     }
 
     static transpileReturn(node: ts.ReturnStatement): string {
-        return "return " + this.transpileExpression(tsEx.getChildren(node)[0]);
+        return "return " + this.transpileExpression(node.expression);
     }
 
     static transpileExpression(node: ts.Node): string {
 
@@ -37,7 +37,7 @@ class TestClass {
     }
 }
 
-function Activate(a) {
+function Activate() {
     let test = function() { return ""; }
     for (let i = 0; i< 10; i++) {
         print(i);
@@ -59,11 +59,18 @@ function Activate(a) {
     i+=1;
     i-=1;
 
-    /*for (let i of [1,2,3]) {
+    let list = [1,2,3];
 
+    for (let i of list) {
+        print(i);
+    }
+
+    for (let i of [1,2,3]) {
+        print(i);
+        print(i+1);
     }
 
     for (let i in [1,2,3]) {
 
-    }*/
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class TestClass {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-function Activate(a) {`
	`40`	`+function Activate() {`
`41`	`41`	`let test = function() { return ""; }`
`42`	`42`	`for (let i = 0; i< 10; i++) {`
`43`	`43`	`print(i);`
`@@ -59,11 +59,18 @@ function Activate(a) {`
`59`	`59`	`i+=1;`
`60`	`60`	`i-=1;`
`61`	`61`
`62`		`- /*for (let i of [1,2,3]) {`
	`62`	`+ let list = [1,2,3];`
`63`	`63`
	`64`	`+ for (let i of list) {`
	`65`	`+ print(i);`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ for (let i of [1,2,3]) {`
	`69`	`+ print(i);`
	`70`	`+ print(i+1);`
`64`	`71`	`}`
`65`	`72`
`66`	`73`	`for (let i in [1,2,3]) {`
`67`	`74`
`68`		`- }*/`
	`75`	`+ }`
`69`	`76`	`}`