Array literal fix

lolleko · lolleko · commit 0f1f5527c6ec · 2018-03-16T19:53:54.000+01:00
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -53,32 +53,32 @@ export class TSHelper {
     }
 
     static isStringType(type: ts.Type): boolean {
-        return (type.flags & ts.TypeFlags.String) != 0
-            || (type.flags & ts.TypeFlags.StringLike) != 0
-            || (type.flags & ts.TypeFlags.StringLiteral) != 0
+        return (type.flags & ts.TypeFlags.String) !== 0
+            || (type.flags & ts.TypeFlags.StringLike) !== 0
+            || (type.flags & ts.TypeFlags.StringLiteral) !== 0
     }
 
     static isArrayType(type: ts.Type): boolean {
-        return (type.flags & ts.TypeFlags.Object) != 0
+        return (type.flags & ts.TypeFlags.Object) !== 0
             && (<ts.ObjectType>type).symbol
             && (<ts.ObjectType>type).symbol.escapedName == "Array";
     }
 
     static isTupleType(type: ts.Type): boolean {
-        return (type.flags & ts.TypeFlags.Object) != 0
-            && (<ts.TypeReference>type).typeArguments != undefined;
+        return (type.flags & ts.TypeFlags.Object) !== 0
+            && (<ts.TypeReference>type).typeArguments !== undefined;
     }
 
     static isCompileMembersOnlyEnum(type: ts.Type, checker: ts.TypeChecker): boolean {
         return type.symbol
-            && ((type.symbol.flags & ts.SymbolFlags.Enum) != 0)
-            && type.symbol.getDocumentationComment(checker)[0] != undefined
+            && ((type.symbol.flags & ts.SymbolFlags.Enum) !== 0)
+            && type.symbol.getDocumentationComment(checker)[0] !== undefined
             && this.hasCustomDecorator(type, checker, "!CompileMembersOnly");
     }
 
     static isPureAbstractClass(type: ts.Type, checker: ts.TypeChecker): boolean {
         return type.symbol
-            && ((type.symbol.flags & ts.SymbolFlags.Class) != 0)
+            && ((type.symbol.flags & ts.SymbolFlags.Class) !== 0)
             && this.hasCustomDecorator(type, checker, "!PureAbstract");
     }
 
@@ -90,13 +90,13 @@ export class TSHelper {
 
     static isPhantom(type: ts.Type, checker: ts.TypeChecker): boolean {
         return type.symbol
-            && ((type.symbol.flags & ts.SymbolFlags.Namespace) != 0)
+            && ((type.symbol.flags & ts.SymbolFlags.Namespace) !== 0)
             && this.hasCustomDecorator(type, checker, "!Phantom");
     }
 
     static isTupleReturnFunction(type: ts.Type, checker: ts.TypeChecker): boolean {
         return type.symbol
-            && ((type.symbol.flags & ts.SymbolFlags.Function) != 0)
+            && ((type.symbol.flags & ts.SymbolFlags.Function) !== 0)
             &&  this.hasCustomDecorator(type, checker, "!TupleReturn");
     }
 
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -795,9 +795,10 @@ export class LuaTranspiler {
                 case ts.TypeFlags.String:
                 case ts.TypeFlags.StringLiteral:
                     return this.transpileStringCallExpression(node);
-                case ts.TypeFlags.Object:
-                    if (tsEx.isArrayType(expType))
-                        return this.transpileArrayCallExpression(node);
+
+            }
+            if (tsEx.isArrayType(expType)) {
+                return this.transpileArrayCallExpression(node);
             }
 
             if (expType.symbol && (expType.symbol.flags & ts.SymbolFlags.Namespace)) {
diff --git a/test/integration/lua/loops.spec.ts b/test/integration/lua/loops.spec.ts
@@ -1,4 +1,4 @@
-import { Expect, Test, TestCase } from "alsatian";
+import { Expect, Test, TestCase, FocusTest } from "alsatian";
 import * as util from "../../src/util"
 
 const deepEqual = require('deep-equal')
@@ -184,6 +184,7 @@ export class LuaLoopTests {
 
     @TestCase([0, 1, 2], [1, 2, 3])
     @Test("forof")
+    @FocusTest
     public forof(inp: any, expected: any) {
         // Transpile
         let lua = util.transpileString(
@@ -194,6 +195,7 @@ export class LuaLoopTests {
             }
             return JSONStringify(arrResultTest);`
         );
+        console.log(lua);
 
         // Execute
         let result = util.executeLua(lua);
diff --git a/test/src/util.ts b/test/src/util.ts
@@ -39,14 +39,6 @@ export function transpileString(str: string, options: CompilerOptions = { dontRe
     return result.trim();
 }
 
-function printAST(node: ts.Node, indent: number) {
-    let indentStr = "";
-    for (let i = 0; i < indent; i++) indentStr += "    ";
-
-    console.log(indentStr + tsEx.enumName(node.kind, ts.SyntaxKind));
-    node.forEachChild(child => printAST(child, indent + 1));
-}
-
 export function transpileFile(path: string): string {
     const program = ts.createProgram([path], {});
     const checker = program.getTypeChecker();
