Merge pull request #63 from Perryvw/polymorphism-fixes

Perryvw · web-flow · commit 17378efff93e · 2018-03-11T17:57:00.000+01:00
Trying to fix polymorphism calls
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -25,6 +25,17 @@ export class TSHelper {
         return "unknown";
     }
 
+    // Breaks down a mask into all flag names.
+    static enumNames(mask, haystack) {
+        let result = [mask];
+        for (var name in haystack) {
+            if ((mask & haystack[name]) != 0 && mask >= haystack[name]) {
+                result.push(name);
+            }
+        }
+        return result;
+    }
+
     static containsStatement(statements: ts.NodeArray<ts.Statement>, kind: ts.SyntaxKind): boolean {
         return statements.some(statement => statement.kind === kind);
     }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -768,13 +768,6 @@ export class LuaTranspiler {
         if (ts.isPropertyAccessExpression(node.expression)) {
             const expType = this.checker.getTypeAtLocation(node.expression.expression);
 
-            // Don't include instance if the type is a namespace
-            if (expType.symbol && expType.symbol.flags & ts.SymbolFlags.Namespace) {
-                const callPath = this.transpileExpression(node.expression);
-                const params = this.transpileArguments(node.arguments);
-                return `${callPath}(${params})`;
-            }
-
             if (expType.symbol && expType.symbol.escapedName == "Math") {
                 const params = this.transpileArguments(node.arguments);
                 return this.transpileMathExpression(node.expression.name) + `(${params})`;
@@ -794,33 +787,15 @@ export class LuaTranspiler {
                         return this.transpileArrayCallExpression(node);
             }
 
-            // Include context parameter if present
-            if (expType && expType.symbol) {
-                const funcName = node.expression.name.escapedText;
-                let funcHolder = tsEx.findMemberHolder(expType, funcName, this.checker);
-
-                // ===== EXPERIMENTAL https://github.com/Perryvw/TypescriptToLua/issues/56
-                if (ts.isParenthesizedExpression(node.expression.expression)
-                    && (ts.isAsExpression(node.expression.expression.expression)
-                     || ts.isTypeAssertion(node.expression.expression.expression))
-                    && ts.isTypeReferenceNode(node.expression.expression.expression.type)) {
-                    const castTypeNode = node.expression.expression.expression.type;
-                    if (this.checker.getTypeFromTypeNode(castTypeNode).symbol.name == funcHolder) {
-                        funcHolder = castTypeNode.getText();
-                    }
-                }
-                // ===== END EXPERIMENTAL
-
-                if (funcHolder === undefined) {
-                    throw new TranspileError(`Could not find func ${funcName} on ${expType.symbol.name}`, node);
-                }
-
-                const callPath = `${funcHolder}.${funcName}`;
-                const params = this.transpileArguments(node.arguments, node.expression.expression);
+            if (expType.symbol && (expType.symbol.flags & ts.SymbolFlags.Namespace)) {
+                // Don't replace . with : for namespaces
+                const callPath = this.transpileExpression(node.expression);
+                const params = this.transpileArguments(node.arguments);
                 return `${callPath}(${params})`;
             } else {
-                const callPath = this.transpileExpression(node.expression);
-                const params = this.transpileArguments(node.arguments, node.expression.expression);
+                 // Replace last . with : here
+                const callPath = `${this.transpileExpression(node.expression.expression)}:${node.expression.name.escapedText}`;
+                const params = this.transpileArguments(node.arguments);
                 return `${callPath}(${params})`;
             }
         }
diff --git a/test/integration/classInstanceCalls.spec.ts b/test/integration/classInstanceCalls.spec.ts
@@ -35,7 +35,7 @@ export class ClassInstanceCallTests {
         this.ExpectEqualToFile(lua, "test/integration/testfiles/classInstanceCall4.lua");
     }
 
-    @Test("aliasCastCall")
+    /*@Test("aliasCastCall")
     public aliasCastCall() {
         const lua = util.transpileFile("test/integration/testfiles/aliasCastCall.ts");
         this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");
@@ -45,5 +45,5 @@ export class ClassInstanceCallTests {
     public aliasAsCall() {
         const lua = util.transpileFile("test/integration/testfiles/aliasAsCall.ts");
         this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");
-    }
+    }*/
 }
diff --git a/test/integration/testfiles/classInstanceCall.lua b/test/integration/testfiles/classInstanceCall.lua
@@ -1 +1 @@
-local x = ClassA.myFunc(ClassB.new(true))
+local x = ClassB.new(true):myFunc()
diff --git a/test/integration/testfiles/classInstanceCall4.lua b/test/integration/testfiles/classInstanceCall4.lua
@@ -6,4 +6,4 @@ function ClassB.new(construct, ...)
     if construct and ClassB.constructor then ClassB.constructor(instance, ...) end
     return instance
 end
-local x = ClassA.myFunc(ClassB.new(true))
+local x = ClassB.new(true):myFunc()

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export class ClassInstanceCallTests {`
`35`	`35`	`this.ExpectEqualToFile(lua, "test/integration/testfiles/classInstanceCall4.lua");`
`36`	`36`	`}`
`37`	`37`
`38`		`- @Test("aliasCastCall")`
	`38`	`+ /*@Test("aliasCastCall")`
`39`	`39`	`public aliasCastCall() {`
`40`	`40`	`const lua = util.transpileFile("test/integration/testfiles/aliasCastCall.ts");`
`41`	`41`	`this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");`
`@@ -45,5 +45,5 @@ export class ClassInstanceCallTests {`
`45`	`45`	`public aliasAsCall() {`
`46`	`46`	`const lua = util.transpileFile("test/integration/testfiles/aliasAsCall.ts");`
`47`	`47`	`this.ExpectEqualToFile(lua, "test/integration/testfiles/aliasCall.lua");`
`48`		`- }`
	`48`	`+ }*/`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-local x = ClassA.myFunc(ClassB.new(true))`
	`1`	`+local x = ClassB.new(true):myFunc()`