TypeScriptToLua
diff --git a/‎Compiler.ts‎
Lines changed: 12 additions & 8 deletions b/‎Compiler.ts‎
Lines changed: 12 additions & 8 deletions
diff --git a/‎Transpiler.ts‎
Lines changed: 23 additions & 7 deletions b/‎Transpiler.ts‎
Lines changed: 23 additions & 7 deletions
diff --git a/‎test/test2.ts‎
Lines changed: 13 additions & 0 deletions b/‎test/test2.ts‎
Lines changed: 13 additions & 0 deletions
@@ -5,14 +5,18 @@ import {LuaTranspiler} from "./Transpiler";
 import {TSHelper as tsEx} from "./TSHelper";
 
 function compile(fileNames: string[], options: ts.CompilerOptions): void {
-    fileNames.forEach(fileName => {
-        const sourceFile = ts.createSourceFile(fileName, readFileSync(fileName).toString(), ts.ScriptTarget.ES2017);
-        
-        // Print AST for debugging
-        printAST(sourceFile, 0);
-
-        // Transpile AST
-        console.log(LuaTranspiler.transpileSourceFile(sourceFile));
+    let program = ts.createProgram(fileNames, options);
+    let checker = program.getTypeChecker();
+
+    program.getSourceFiles().forEach(sourceFile => {
+        if (!sourceFile.isDeclarationFile) {       
+            // Print AST for debugging
+            //printAST(sourceFile, 0);
+
+            // Transpile AST
+            let lua = LuaTranspiler.transpileSourceFile(sourceFile, checker);
+            console.log(lua);
+        }
     });
 
     process.exit();
 
@@ -13,15 +13,17 @@ export class TranspileError extends Error {
 
 export class LuaTranspiler {
     // Transpile a source file
-    static transpileSourceFile(node: ts.SourceFile): string {
-        let transpiler = new LuaTranspiler();
+    static transpileSourceFile(node: ts.SourceFile, checker: ts.TypeChecker): string {
+        let transpiler = new LuaTranspiler(checker);
         return transpiler.transpileBlock(node);
     }
 
     indent: string;
+    checker: ts.TypeChecker;
 
-    constructor() {
+    constructor(checker: ts.TypeChecker) {
         this.indent = "";
+        this.checker = checker;
     }
 
     pushIndent(): void {
@@ -138,8 +140,12 @@ export class LuaTranspiler {
         // Transpile expression
         const expression = this.transpileExpression(node.expression);
 
+        // Use ipairs for array types, pairs otherwise
+        const isArray = this.checker.getTypeAtLocation(node.expression).symbol.escapedName == "Array";
+        const pairs = isArray ? "ipairs" : "pairs";
+
         // Make header
-        let result = this.indent + `for _, ${identifier.escapedText} in pairs(${expression}) do\n`;
+        let result = this.indent + `for _, ${identifier.escapedText} in ${pairs}(${expression}) do\n`;
 
         // For body
         this.pushIndent();
@@ -157,8 +163,12 @@ export class LuaTranspiler {
         // Transpile expression
         const expression = this.transpileExpression(node.expression);
 
+        // Use ipairs for array types, pairs otherwise
+        const isArray = this.checker.getTypeAtLocation(node.expression).symbol.escapedName == "Array";
+        const pairs = isArray ? "ipairs" : "pairs";
+
         // Make header
-        let result = this.indent + `for ${identifier.escapedText}, _ in pairs(${expression}) do\n`;
+        let result = this.indent + `for ${identifier.escapedText}, _ in ${pairs}(${expression}) do\n`;
 
         // For body
         this.pushIndent();
@@ -329,7 +339,13 @@ export class LuaTranspiler {
         const element = this.transpileExpression(node.expression);
         const index = this.transpileExpression(node.argumentExpression);
 
-        return `${element}[${index}]`;
+        const isArray = this.checker.getTypeAtLocation(node.expression).symbol.escapedName == "Array";
+
+        if (isArray) {
+            return `${element}[${index}+1]`;
+        } else {
+            return `${element}[${index}]`;
+        }
     }
 
     // Transpile a variable statement
@@ -503,6 +519,6 @@ export class LuaTranspiler {
         this.pushIndent();
         result += this.transpileBlock(node.body);
         this.popIndent();
-        return result + this.indent + "end\n";
+        return result + this.indent + "end ";
     }
 }
@@ -61,10 +61,23 @@ function Activate() {
     let a = 24 & 4;
 
     let list = [1,2,3];
+    let obj = {a: 3};
     for (let i = 0; i < list.length; i++) {
         print(list[i]);
     }
 
+    for (var b of [1,2,3]) {
+
+    }
+
+    for (var c of list) {
+
+    }
+
+    for (var d in obj) {
+
+    }
+
     if (i == 3 && i < 3) {
         print(4);
     } else {