Fixed comments && more tests

lolleko · lolleko · commit b0f04e7a9b70 · 2018-04-01T00:02:28.000+02:00
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -101,10 +101,13 @@ export class TSHelper {
     }
 
     public static hasCustomDecorator(type: ts.Type, checker: ts.TypeChecker, decorator: string): boolean {
-        const comment = type.symbol.getDocumentationComment(checker);
-        const decorators =
-            comment.filter((_) => _.kind === "text").map((_) => _.text.trim()).filter((_) => _[0] === "!");
-        return decorators.indexOf(decorator) > -1;
+        if (type.symbol) {
+            const comment = type.symbol.getDocumentationComment(checker);
+            const decorators =
+                comment.filter((_) => _.kind === "text").map((_) => _.text.trim()).filter((_) => _[0] === "!");
+            return decorators.indexOf(decorator) > -1;
+        }
+        return false;
     }
 
     // Search up until finding a node satisfying the callback
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -361,21 +361,17 @@ export class LuaTranspiler {
     }
 
     public transpileFor(node: ts.ForStatement): string {
-        // Get iterator variable
-        const variableDeclaration = (node.initializer as ts.VariableDeclarationList).declarations[0];
-        const variable = this.transpileVariableDeclaration(variableDeclaration);
-        const condition = this.transpileExpression(node.condition);
-        const incrementor = this.transpileExpression(node.incrementor);
-
         // Add header
-        let result = `--for(${variable.trim()}; ${condition}; ${incrementor};)\n`;
-        result += this.indent + variable;
+        let result = "";
+        for (const variableDeclaration of (node.initializer as ts.VariableDeclarationList).declarations) {
+            result += this.transpileVariableDeclaration(variableDeclaration);
+        }
         result += this.indent + `while(${this.transpileExpression(node.condition)}) do\n`;
 
         // Add body
         this.pushIndent();
         result += this.transpileStatement(node.statement);
-        result += this.indent + incrementor + "\n";
+        result += this.indent + this.transpileExpression(node.incrementor) + "\n";
         this.popIndent();
 
         result += this.indent + "end\n";
diff --git a/test/translation/lua/classExtension1.lua b/test/translation/lua/classExtension1.lua
diff --git a/test/translation/lua/classExtension2.lua b/test/translation/lua/classExtension2.lua
@@ -0,0 +1,2 @@
+function TestClass.myFunction(self)
+end
diff --git a/test/translation/lua/classStaticMembers.lua b/test/translation/lua/classStaticMembers.lua
@@ -0,0 +1,10 @@
+MyClass = MyClass or {}
+MyClass.__index = MyClass
+function MyClass.new(construct, ...)
+    local instance = setmetatable({}, MyClass)
+    if construct and MyClass.constructor then MyClass.constructor(instance, ...) end
+    return instance
+end
+MyClass.test = 0
+function MyClass.constructor(self)
+end
diff --git a/test/translation/ts/classExtension1.ts b/test/translation/ts/classExtension1.ts
diff --git a/test/translation/ts/classExtension2.ts b/test/translation/ts/classExtension2.ts
@@ -0,0 +1,9 @@
+/** !Extension */
+class TestClass {
+}
+
+
+/** !Extension */
+class MyClass extends TestClass {
+    myFunction() {}
+}
diff --git a/test/translation/ts/classStaticMembers.ts b/test/translation/ts/classStaticMembers.ts
@@ -0,0 +1,3 @@
+class MyClass {
+    public static test = 0;
+}
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -102,8 +102,7 @@ export class LuaLoopTests {
     @TestCase([0, 1, 2, 3], [1, 2, 3, 4], "let i = 0; arrTest.length > i; i++")
     @TestCase([0, 1, 2, 3], [1, 2, 3, 4], "let i = 0; arrTest.length - 1 >= i; i++")
     @TestCase([0, 1, 2, 3], [1, 1, 3, 3], "let i = 0; i < arrTest.length; i += 2")
-    // @TestCase([0, 1, 2, 3], [1, 2, 3, 4], "let i = arrTest.length - 1; i <= 0; i--")
-    // @TestCase([0, 1, 2, 3], [0, 2, 2, 4], "let i = arrTest.length - 1; i <= 0; i -= 2")
+    @TestCase([0, 1, 2, 3], [1, 2, 3, 4 ], "let i = arrTest.length - 1; i >= 0; i--")
     @TestCase([0, 1, 2, 3], [0, 2, 2, 4], "let i = arrTest.length - 1; i >= 0; i -= 2")
     @TestCase([0, 1, 2, 3], [0, 2, 2, 4], "let i = arrTest.length - 1; i > 0; i -= 2")
     @Test("forheader")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+function TestClass.myFunction(self)`
	`2`	`+end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class MyClass {`
	`2`	`+ public static test = 0;`
	`3`	`+}`