Bug: Unable to perform vector arithmetic when one side has multi-value expression.

E.g.
vec2(1, 2) + vec2(3, 4) works
vec2(1, 2) + vec2(1. + 2., 4) fails

Author: DeanEdisGG

ShaderShrinker/Shrinker.Parser/Optimizations/PerformArithmeticExtension.cs

@@ -323,34 +323,38 @@ public static bool PerformArithmetic(this SyntaxNode rootNode)
                         {
                             // Find the second vector.
                             var rhsVectorNode = symbolNode.Next;
-                            if (rhsVectorNode?.Token is TypeToken t && t.IsVector())
-                            {
-                                var rhsVectorBrackets = rhsVectorNode.Next as RoundBracketSyntaxNode;
-                                if (IsSafeToPerformMath(vectorNode, symbol, rhsVectorNode))
-                                {
-                                    // Ensure both brackets have the same number of elements.
-                                    var lhsCsv = brackets.GetCsv().ToList();
-                                    var rhsCsv = rhsVectorBrackets.GetCsv().ToList();
-                                    while (lhsCsv.Count < rhsCsv.Count)
-                                        lhsCsv.Add(new[] { lhsCsv.First().Single().Clone() });
-                                    while (rhsCsv.Count < lhsCsv.Count)
-                                        rhsCsv.Add(new[] { rhsCsv.First().Single().Clone() });
-
-                                    // Perform math on each bracketed value.
-                                    var newCsv =
-                                        lhsCsv
-                                            .Select((o, i) => DoNodeMath(o.Single(), symbolNode, rhsCsv[i].Single()))
-                                            .Select(o => new GenericSyntaxNode(FloatToken.From(o, MaxDp).AsIntIfPossible()));
-
-                                    // Replace bracket content and sum.
-                                    brackets.ReplaceWith(new RoundBracketSyntaxNode(newCsv.ToCsv()));
-                                    symbolNode.Remove();
-                                    rhsVectorNode.Remove();
-                                    rhsVectorBrackets.Remove();
+                            if (rhsVectorNode?.Token is not TypeToken t || !t.IsVector())
+                                continue;
+
+                            var rhsVectorBrackets = rhsVectorNode.Next as RoundBracketSyntaxNode;
+                            if (!IsSafeToPerformMath(vectorNode, symbol, rhsVectorNode))
+                                continue;
+
+                            // Ensure both brackets have the same number of elements.
+                            var lhsCsv = brackets.GetCsv().ToList();
+                            var rhsCsv = rhsVectorBrackets.GetCsv().ToList();
+                            while (lhsCsv.Count < rhsCsv.Count)
+                                lhsCsv.Add(new[] { lhsCsv.First().Single().Clone() });
+                            while (rhsCsv.Count < lhsCsv.Count)
+                                rhsCsv.Add(new[] { rhsCsv.First().Single().Clone() });
+
+                            // Don't yet support 'vecN(f) * vecN(a * b, ...)'
+                            if (lhsCsv.Any(o => o.Count > 1) || rhsCsv.Any(o => o.Count > 1))
+                                continue;
+
+                            // Perform math on each bracketed value.
+                            var newCsv =
+                                lhsCsv
+                                    .Select((o, i) => DoNodeMath(o.Single(), symbolNode, rhsCsv[i].Single()))
+                                    .Select(o => new GenericSyntaxNode(FloatToken.From(o, MaxDp).AsIntIfPossible()));
+
+                            // Replace bracket content and sum.
+                            brackets.ReplaceWith(new RoundBracketSyntaxNode(newCsv.ToCsv()));
+                            symbolNode.Remove();
+                            rhsVectorNode.Remove();
+                            rhsVectorBrackets.Remove();
 
-                                    didChange = true;
-                                }
-                            }
+                            didChange = true;
                         }
                     }
                 }

ShaderShrinker/UnitTests/VectorArithmeticTests.cs

@@ -417,7 +417,8 @@ public void CheckArithmeticWithVectorAndVector(
                     "vec2 f = vec2(3, 4) + vec2(5);",
                     "vec2 f = vec2(3) + vec2(4, 5);",
                     "vec2 v = vec2(1, 2), f = v * vec2(1.1, 2.2) + vec2(6, 7);",
-                    "vec2 v = vec2(1, 2), f = vec2(1.1, 2.2) + vec2(6, 7) * v;")] string code,
+                    "vec2 v = vec2(1, 2), f = vec2(1.1, 2.2) + vec2(6, 7) * v;",
+                    "vec2 f = vec2(3, 4) + vec2(1. * 2., 3);")] string code,
             [Values("vec2 f = vec2(2.1, 4.2);",
                     "vec2 f = vec2(8.1, 11.2);",
                     "vec2 f = vec2(7.1, 9.2);",
@@ -436,7 +437,8 @@ public void CheckArithmeticWithVectorAndVector(
                     "vec2 f = vec2(8, 9);",
                     "vec2 f = vec2(7, 8);",
                     "vec2 v = vec2(1, 2), f = v * vec2(1.1, 2.2) + vec2(6, 7);",
-                    "vec2 v = vec2(1, 2), f = vec2(1.1, 2.2) + vec2(6, 7) * v;")] string expected)
+                    "vec2 v = vec2(1, 2), f = vec2(1.1, 2.2) + vec2(6, 7) * v;",
+                    "vec2 f = vec2(5, 7);")] string expected)
         {
             var lexer = new Lexer();
             lexer.Load(code);