Improve AddSubTransformer

This commit improves support for simplifying a series of multiple
additions/subtractions and doing so in a single pass.

Signed-off-by: Graham <gpe@openrs2.dev>

deob-ast/src/main/java/dev/openrs2/deob/ast/transform/AddSubTransformer.kt

@@ -19,32 +19,71 @@ class AddSubTransformer : Transformer() {
     override fun transformUnit(group: LibraryGroup, library: Library, unit: CompilationUnit) {
         unit.walk { expr: BinaryExpr ->
             val op = expr.operator
-            val left = expr.left
+            if (op != BinaryExpr.Operator.PLUS && op != BinaryExpr.Operator.MINUS) {
-            val right = expr.right
-            val type = expr.calculateResolvedType()
-
-            if (op == BinaryExpr.Operator.PLUS && type.isString()) {
                 return@walk
             }
 
-            if (op == BinaryExpr.Operator.PLUS && right.isNegative()) {
+            val type = expr.calculateResolvedType()
-                // x + -y => x - y
+            if (type.isString()) {
-                expr.operator = BinaryExpr.Operator.MINUS
-                expr.right = right.negate()
-            } else if (op == BinaryExpr.Operator.PLUS && left.isNegative()) {
-                if (expr.hasSideEffects()) {
                 return@walk
             }
 
-                // -x + y => y - x
+            val terms = mutableListOf<Expression>()
-                expr.operator = BinaryExpr.Operator.MINUS
+            addTerms(terms, expr, negate = false)
-                expr.left = right.clone()
+
-                expr.right = left.negate()
+            terms.sortWith(Comparator { a, b ->
-            } else if (op == BinaryExpr.Operator.MINUS && right.isNegative()) {
+                // preserve the order of adjacent expressions with side effects
-                // x - -y => x + y
+                val aHasSideEffects = a.hasSideEffects()
-                expr.operator = BinaryExpr.Operator.PLUS
+                val bHasSideEffects = b.hasSideEffects()
-                expr.right = right.negate()
+                if (aHasSideEffects && bHasSideEffects) {
+                    return@Comparator 0
+                }
+
+                // push negative expressions to the right so we can replace unary minus with binary minus
+                val aNegative = a.isNegative()
+                val bNegative = b.isNegative()
+                if (aNegative && !bNegative) {
+                    return@Comparator 1
+                } else if (!aNegative && bNegative) {
+                    return@Comparator -1
+                }
+
+                return@Comparator 0
+            })
+
+            val newExpr = terms.reduce { left, right ->
+                if (right.isNegative()) {
+                    BinaryExpr(left.clone(), right.negate(), BinaryExpr.Operator.MINUS)
+                } else {
+                    BinaryExpr(left.clone(), right.clone(), BinaryExpr.Operator.PLUS)
+                }
+            }
+
+            expr.replace(newExpr)
+        }
+    }
+
+    private fun addTerms(terms: MutableList<Expression>, expr: Expression, negate: Boolean) {
+        when {
+            expr is UnaryExpr -> when {
+                expr.operator == UnaryExpr.Operator.MINUS -> addTerms(terms, expr.expression, !negate)
+                negate -> terms += expr.negate()
+                else -> terms += expr
+            }
+            expr is BinaryExpr -> when {
+                expr.operator == BinaryExpr.Operator.PLUS -> {
+                    addTerms(terms, expr.left, negate)
+                    addTerms(terms, expr.right, negate)
+                }
+                expr.operator == BinaryExpr.Operator.MINUS -> {
+                    addTerms(terms, expr.left, negate)
+                    addTerms(terms, expr.right, !negate)
+                }
+                negate -> terms += expr.negate()
+                else -> terms += expr
             }
+            negate -> terms += expr.negate()
+            else -> terms += expr
         }
     }