Fixed bug where constructor was called before initializing fields.

Perryvw · Perryvw · commit 452aab917677 · 2018-07-15T16:37:01.000+02:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1384,8 +1384,6 @@ export abstract class LuaTranspiler {
         }
         result += this.indent + `function ${className}.new(construct, ...)\n`;
         result += this.indent + `    local instance = setmetatable({}, ${className})\n`;
-        result += this.indent + `    if construct and ${className}.constructor then `
-                              + `${className}.constructor(instance, ...) end\n`;
 
         for (const f of instanceFields) {
             // Get identifier
@@ -1397,6 +1395,9 @@ export abstract class LuaTranspiler {
             result += this.indent + `    instance.${fieldName} = ${value}\n`;
         }
 
+        result += this.indent + `    if construct and ${className}.constructor then `
+                      + `${className}.constructor(instance, ...) end\n`;
+
         result += this.indent + `    return instance\n`;
         result += this.indent + `end\n`;
 
diff --git a/test/unit/class.spec.ts b/test/unit/class.spec.ts
@@ -5,12 +5,29 @@ import * as util from "../src/util";
 
 export class ClassTests {
 
+    @Test("ClassFieldInitializer")
+    public classFieldInitializer() {
+        // Transpile
+        const lua = util.transpileString(
+            `class a {
+                field: number = 4;
+            }
+            return new a().field;`
+        );
+
+        // Execute
+        const result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(4);
+    }
+
     @Test("ClassConstructor")
     public classConstructor() {
         // Transpile
         const lua = util.transpileString(
             `class a {
-                field: number;
+                field: number = 3;
                 constructor(n: number) {
                     this.field = n * 2;
                 }
@@ -230,6 +247,31 @@ export class ClassTests {
         Expect(result).toBe(4);
     }
 
+    @Test("ClassMethodOverride")
+    public classMethodOverride() {
+        // Transpile
+        const lua = util.transpileString(
+            `class a {
+                public method(): number {
+                    return 2;
+                }
+            }
+            class b extends a {
+                public method(): number {
+                    return 4;
+                }
+            }
+            let inst = new b();
+            return inst.method();`
+        );
+
+        // Execute
+        const result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(4);
+    }
+
     @Test("methodDefaultParameters")
     public methodInheritedParameters() {
         // Transpile
