fix evaluation order for assignments

first left, then right

Author: peq

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/EliminateTuples.java

@@ -7,7 +7,6 @@
 import de.peeeq.wurstscript.jassIm.*;
 import de.peeeq.wurstscript.translation.imtranslation.ImTranslator.VarsForTupleResult;
 import de.peeeq.wurstscript.types.TypesHelper;
-import de.peeeq.wurstscript.utils.Pair;
 import de.peeeq.wurstscript.utils.Utils;
 
 import java.util.ArrayList;
@@ -24,28 +23,7 @@
  */
 public class EliminateTuples {
 
-    /*
-    TODO this could be simplified:
 
-    Visit and rewrite only the expressions that must be changed:
-
-
-
-    2. Normalize Tuples in statement-expressions (move to first tuple param)
-
-        Normalize
-        {stmts >> <e1,e2,e3>}
-        becomes <{stmts >> e1}, e2, e3}
-
-
-    3. Remove tuple expressions
-
-
-      - In parameters: Just flatten
-      - Assignments: Become several assignments
-      - In Return: Use temp returns
-
-     */
 
     public static void eliminateTuplesProg(ImProg imProg, ImTranslator translator) {
 
@@ -108,7 +86,6 @@ public void visit(ImTupleSelection ts) {
                         extractSideEffect(te, stmts);
                     } else { // if it is the part we want to return ...
                         result = extractSideEffect(te, stmts);
-                        // TODO in this and all the following remove side effects and add them to stmts
                     }
                 }
                 assert result != null;
@@ -404,8 +381,16 @@ private static ImStatementExpr inSet(ImSet imSet, ImFunction f) {
         ImTupleExpr right = (ImTupleExpr) imSet.getRight();
 
         ImStmts stmts = JassIm.ImStmts();
+
+        // 1) extract side effects from left expressions
+        List<ImExpr> leftExprs = new ArrayList<>();
+        for (ImExpr expr : left.getExprs()) {
+            leftExprs.add(extractSideEffect(expr, stmts));
+        }
+
+
         List<ImVar> tempVars = new ArrayList<>();
-        // first assign right hand side to temporary variables:
+        // 2) assign right hand side to temporary variables:
         for (ImExpr expr : right.getExprs()) {
             ImVar temp = JassIm.ImVar(expr.attrTrace(), expr.attrTyp(), "tuple_temp", false);
             expr.setParent(null);
@@ -414,9 +399,8 @@ private static ImStatementExpr inSet(ImSet imSet, ImFunction f) {
             f.getLocals().add(temp);
         }
         // then assign right vars
-        // TODO side effects from left expressions should come before side effects on right
-        for (int i = 0; i < left.getExprs().size(); i++) {
-            ImLExpr leftE = (ImLExpr) left.getExprs().get(i);
+        for (int i = 0; i < leftExprs.size(); i++) {
+            ImLExpr leftE = (ImLExpr) leftExprs.get(i);
             leftE.setParent(null);
             stmts.add(JassIm.ImSet(imSet.getTrace(), leftE, JassIm.ImVarAccess(tempVars.get(i))));
         }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/Flatten.java

@@ -234,10 +234,10 @@ public static Result flatten(ImReturn s, ImTranslator t, ImFunction f) {
 
 
     public static Result flatten(ImSet s, ImTranslator t, ImFunction f) {
-        Result r = s.getRight().flatten(t, f);
         Result l = s.getLeft().flatten(t, f);
-        List<ImStmt> stmts = Lists.newArrayList(r.stmts);
-        stmts.addAll(l.stmts);
+        Result r = s.getRight().flatten(t, f);
+        List<ImStmt> stmts = Lists.newArrayList(l.stmts);
+        stmts.addAll(r.stmts);
         stmts.add(JassIm.ImSet(s.getTrace(), (ImLExpr) l.expr, r.expr));
         return new Result(stmts);
     }

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/TupleTests.java

@@ -506,4 +506,25 @@ public void tupleArrayInClass2() { // see #572
         );
     }
 
+    @Test
+    public void tupleArraySideEvaluationOrder() {
+        testAssertOkLines(true,
+                "package test",
+                "native testSuccess()",
+                "int x = 1",
+                "tuple p(int x, int y)",
+                "p array ar",
+                "function foo() returns int",
+                "    x = x * 2",
+                "    return 1",
+                "function bar() returns int",
+                "    x = x + 1",
+                "    return 1",
+                "init",
+                "    ar[foo()] = p(bar(), 7)",
+                "    if x == 3 and ar[1].x == 1 and ar[1].y == 7",
+                "        testSuccess()"
+        );
+    }
+
 }