Fix string optimization

UnderminersTeam · Mar 1, 2025 · 2529a1b · 2529a1b
1 parent cb91ad8
commit 2529a1b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Underanalyzer/Compiler/Nodes/BinaryChainNode.cs b/Underanalyzer/Compiler/Nodes/BinaryChainNode.cs
@@ -183,7 +183,7 @@ public IASTNode Duplicate(ParseContext context)
                 new NumberNode(leftInt64.Value + rightNumber.Value, leftInt64.NearbyToken),
             (BinaryOperation.Add, Int64Node leftInt64, Int64Node rightInt64) =>
                 new Int64Node(leftInt64.Value + rightInt64.Value, leftInt64.NearbyToken),
-            (BinaryOperation.Add, StringNode leftString, Int64Node rightString) =>
+            (BinaryOperation.Add, StringNode leftString, StringNode rightString) =>
                 new StringNode(leftString.Value + rightString.Value, leftString.NearbyToken),
 
             (BinaryOperation.Subtract, NumberNode leftNumber, NumberNode rightNumber) =>

diff --git a/UnderanalyzerTest/BytecodeContext.GenerateCode.cs b/UnderanalyzerTest/BytecodeContext.GenerateCode.cs
@@ -2431,4 +2431,18 @@ pop.v.i self.a
             """
         );
     }
+
+    [Fact]
+    public void TestStringOptimization()
+    {
+        TestUtil.AssertBytecode(
+            """
+            a = "b" + "c" + "d";
+            """,
+            """
+            push.s "bcd"
+            pop.v.s self.a
+            """
+        );
+    }
 }