Changed calls to [type].func([instance], ...) in front of [instance].func([instance], ...)

Perryvw · Perryvw · commit ce44bfb23918 · 2018-02-06T20:03:59.000+01:00
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -496,7 +496,8 @@ var LuaTranspiler = /** @class */ (function () {
                         return this.transpileArrayCallExpression(node);
             }
             // Include context parameter if present
-            var callPath_1 = this.transpileExpression(node.expression);
+            var expType = this.checker.getTypeAtLocation(node.expression.expression);
+            var callPath_1 = (expType && expType.symbol) ? expType.symbol.name + "." + node.expression.name.escapedText : this.transpileExpression(node.expression);
             var params_1 = this.transpileArguments(node.arguments, node.expression.expression);
             return callPath_1 + "(" + params_1 + ")";
         }
@@ -561,6 +562,8 @@ var LuaTranspiler = /** @class */ (function () {
                 return "TS_slice(" + caller + ", " + params + ")";
             case "splice":
                 return "TS_splice(" + caller + ", " + params + ")";
+            case "join":
+                return "table.concat(" + caller + ", " + params + ")";
             default:
                 throw new TranspileError("Unsupported array function: " + expression.name.escapedText, node);
         }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -540,8 +540,10 @@ export class LuaTranspiler {
             }
 
             // Include context parameter if present
-            let callPath = this.transpileExpression(node.expression);
-            const params = this.transpileArguments(node.arguments, node.expression.expression);
+            const expType = this.checker.getTypeAtLocation(node.expression.expression);
+            let callPath = (expType && expType.symbol) ? `${expType.symbol.name}.${node.expression.name.escapedText}` : this.transpileExpression(node.expression);
+            let params = this.transpileArguments(node.arguments, node.expression.expression);
+            
             return `${callPath}(${params})`;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,8 @@ var LuaTranspiler = /** @class */ (function () {`
`496`	`496`	`return this.transpileArrayCallExpression(node);`
`497`	`497`	`}`
`498`	`498`	`// Include context parameter if present`
`499`		`- var callPath_1 = this.transpileExpression(node.expression);`
	`499`	`+ var expType = this.checker.getTypeAtLocation(node.expression.expression);`
	`500`	`+ var callPath_1 = (expType && expType.symbol) ? expType.symbol.name + "." + node.expression.name.escapedText : this.transpileExpression(node.expression);`
`500`	`501`	`var params_1 = this.transpileArguments(node.arguments, node.expression.expression);`
`501`	`502`	`return callPath_1 + "(" + params_1 + ")";`
`502`	`503`	`}`
`@@ -561,6 +562,8 @@ var LuaTranspiler = /** @class */ (function () {`
`561`	`562`	`return "TS_slice(" + caller + ", " + params + ")";`
`562`	`563`	`case "splice":`
`563`	`564`	`return "TS_splice(" + caller + ", " + params + ")";`
	`565`	`+ case "join":`
	`566`	`+ return "table.concat(" + caller + ", " + params + ")";`
`564`	`567`	`default:`
`565`	`568`	`throw new TranspileError("Unsupported array function: " + expression.name.escapedText, node);`
`566`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -540,8 +540,10 @@ export class LuaTranspiler {`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`// Include context parameter if present`
`543`		`- let callPath = this.transpileExpression(node.expression);`
`544`		`- const params = this.transpileArguments(node.arguments, node.expression.expression);`
	`543`	`+ const expType = this.checker.getTypeAtLocation(node.expression.expression);`
	`544`	+ let callPath = (expType && expType.symbol) ? `${expType.symbol.name}.${node.expression.name.escapedText}` : this.transpileExpression(node.expression);
	`545`	`+ let params = this.transpileArguments(node.arguments, node.expression.expression);`
	`546`	`+`
`545`	`547`	return `${callPath}(${params})`;
`546`	`548`	`}`
`547`	`549`