Fixed conversion of 'setTimeout(callback, (a + b) * 1000, args)'. fixes

#293
HaxeFoundation · Oct 25, 2017 · 59b23ad · 59b23ad
1 parent bae573e
commit 59b23ad
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,5 @@
 ## dev
+ - Fixed conversion of `setTimeout(callback, (a + b) * 1000)`. fixes #293
  - Fixed conversion of `parseInt('0xFFFFFF', 16)`. fixes #265
 
 ## 2017-10-24(1.0.6)

diff --git a/src/as3hx/parsers/StructureParser.hx b/src/as3hx/parsers/StructureParser.hx
@@ -321,8 +321,12 @@ class StructureParser {
                     var t = tokenizer.token();
                     switch(t) {
                         case TPOpen: parCount++;
-                        case TPClose: parCount--;
+                        case TPClose:
+                            parCount--;
+                            if(params.length > 0) params[params.length - 1] = EParent(params[params.length - 1]);
                         case TComma:
+                        case TOp(op) if(params.length > 0):
+                            params[params.length - 1] = ParserUtils.makeBinop(tokenizer, op, params[params.length - 1], parseExpr(false));
                         case _:
                             tokenizer.add(t);
                             if(params.length < 2) params.push(parseExpr(false));
@@ -331,8 +335,8 @@ class StructureParser {
                                 switch(params[2]) {
                                     case EArrayDecl(e): e.push(parseExpr(false));
                                     case _:
+                                }
                             }
-                        }
                     }
                 }
                 params;

diff --git a/test/issues/Issue293.as b/test/issues/Issue293.as
@@ -0,0 +1,10 @@
+package {
+    import flash.utils.setTimeout;
+    public class Issue293 {
+        public function Issue293() {
+            var i:int = setTimeout(function(...args) {
+                trace(args);
+            }, (1 + 1) * 1000, 1, 2, 3);
+        }
+    }
+}
diff --git a/test/issues/Issue293.hx b/test/issues/Issue293.hx
@@ -0,0 +1,11 @@
+
+class Issue293
+{
+    public function new()
+    {
+        var i : Int = as3hx.Compat.setTimeout(function(args : Array<Dynamic> = null)
+                {
+                    trace(args);
+                }, (1 + 1) * 1000, [1, 2, 3]);
+    }
+}
diff --git a/test/unit/as3hx/AS3HXTest.hx b/test/unit/as3hx/AS3HXTest.hx
@@ -521,6 +521,11 @@ class AS3HXTest {
         generate("Issue273.as", "Issue273.hx");
     }
 
+    @Test("setTimeout(callback, (a + b) * 1000, args)")
+    public function issue293() {
+        generate("Issue293.as", "Issue293.hx");
+    }
+
     function generate(as3FileName:String, expectedHaxeFileName:String) {
         var issuesDirectory = FileSystem.absolutePath("test/issues");
         var generatedDirectoryPath = '$issuesDirectory/generated';