Add multiple argument support to array.push() (#62)

zapp-brannigan-dota · Perryvw · commit 8f692fddb08f · 2018-03-11T14:38:52.000+01:00
* Add multiple argument support to array.push()

* Add TS_push() to lualib

* Fix TS_push() and add tests

* Fix array.push test

* Fix array.push test
diff --git a/dist/lualib/typescript.lua b/dist/lualib/typescript.lua
@@ -115,6 +115,12 @@ function TS_split(str, separator)
     return out
 end
 
+function TS_push(list, ...)
+    for _, v in pairs({...}) do
+        list[#list + 1] = v
+    end
+end
+
 -- Set data structure implementation
 Set = Set or {}
 Set.__index = Set
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -899,10 +899,7 @@ export class LuaTranspiler {
         const caller = this.transpileExpression(expression.expression);
         switch (expression.name.escapedText) {
             case "push":
-                if (node.arguments.length > 1) {
-                    throw new TranspileError("Unsupported array function: " + expression.name.escapedText + " with more than one argument", node);
-                }
-                return `table.insert(${caller}, ${params})`;
+                return `TS_push(${caller}, ${params})`;
             case "forEach":
                 return `TS_forEach(${caller}, ${params})`;
             case "indexOf":
@@ -1074,7 +1071,7 @@ export class LuaTranspiler {
             const vars = node.name.elements.map(element => (<ts.Identifier>(<ts.BindingElement>element).name).escapedText).join(",");
 
             // Don't unpack TupleReturn decorated functions
-            if (ts.isCallExpression(node.initializer) 
+            if (ts.isCallExpression(node.initializer)
                 && tsEx.isTupleReturnFunction(this.checker.getTypeAtLocation(node.initializer.expression), this.checker)) {
                 return `local ${vars}=${value}`;
             } else {
diff --git a/test/integration/lua/lualib.spec.ts b/test/integration/lua/lualib.spec.ts
@@ -225,4 +225,23 @@ export class LuaLibArrayTests {
         // Assert
         Expect(result).toBe(expected);
     }
+
+    @TestCase([1])
+    @TestCase([1, 2, 3])
+    @Test("array.push")
+    public arrayPush(inp: number[]) {
+        // Transpile
+        let lua = util.transpileString(
+            `let testArray = [0];
+            testArray.push(${inp.join(', ')});
+            return JSONStringify(testArray);
+            `
+            , util.dummyTypes.Array);
+
+        // Execute
+        let result = util.executeLua(lua);
+
+        // Assert
+        Expect(result).toBe(JSON.stringify([0].concat(inp)));
+    }
 }
