Changed typeof returning object instead of table

Perryvw · Perryvw · commit b4d4504af4f8 · 2018-07-01T10:22:45.000+02:00
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1132,7 +1132,7 @@ export abstract class LuaTranspiler {
 
     public transpileTypeOfExpression(node: ts.TypeOfExpression): string {
         const expression = this.transpileExpression(node.expression);
-        return `type(${expression})`;
+        return `type(${expression}) == "table" and "object" or type(${expression})`;
     }
 
     // Transpile a variable statement
diff --git a/test/unit/typechecking.spec.ts b/test/unit/typechecking.spec.ts
@@ -42,15 +42,23 @@ export class OverloadTests {
         const lua = util.transpileString(`return typeof ${inp};`);
         const result = util.executeLua(lua);
 
-        Expect(result).toBe("table");
+        Expect(result).toBe("object");
     }
 
     @Test("typeof class instance")
     public typeofClassInstance() {
         const lua = util.transpileString(`class myClass {} let inst = new myClass(); return typeof inst;`);
         const result = util.executeLua(lua);
 
-        Expect(result).toBe("table");
+        Expect(result).toBe("object");
+    }
+
+    @Test("typeof function")
+    public typeofFunction() {
+        const lua = util.transpileString(`return typeof (() => 3);`);
+        const result = util.executeLua(lua);
+
+        Expect(result).toBe("function");
     }
 
     @TestCase("null")

Original file line number	Diff line number	Diff line change
`@@ -1132,7 +1132,7 @@ export abstract class LuaTranspiler {`
`1132`	`1132`
`1133`	`1133`	`public transpileTypeOfExpression(node: ts.TypeOfExpression): string {`
`1134`	`1134`	`const expression = this.transpileExpression(node.expression);`
`1135`		- return `type(${expression})`;
	`1135`	+ return `type(${expression}) == "table" and "object" or type(${expression})`;
`1136`	`1136`	`}`
`1137`	`1137`
`1138`	`1138`	`// Transpile a variable statement`