Bug fix Jass Parser converting -2147483648 to --2147483648

Drake53 · Dec 17, 2024 · 766b719 · 766b719
1 parent d9359e6
commit 766b719
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/src/War3Net.CodeAnalysis.Decompilers/Script/MapTriggersDecompiler.cs b/src/War3Net.CodeAnalysis.Decompilers/Script/MapTriggersDecompiler.cs
@@ -156,7 +156,7 @@ setVariableStatement.Indexer is JassVariableReferenceExpressionSyntax i &&
 
                             var variableDefinition = mapTriggers.Variables.Single(v => string.Equals(v.Name, variableName, StringComparison.Ordinal));
 
-                            variableDefinition.ArraySize = arraySize;
+                            variableDefinition.ArraySize = (int)arraySize;
 
                             if (TryDecompileVariableDefinitionInitialValue(setVariableStatement.Value.Expression, variableDefinition.Type, out var initialValue))
                             {

diff --git a/src/War3Net.CodeAnalysis.Jass/Extensions/ExpressionSyntaxExtensions.cs b/src/War3Net.CodeAnalysis.Jass/Extensions/ExpressionSyntaxExtensions.cs
@@ -29,7 +29,7 @@ public static bool TryGetIntegerExpressionValue(this IExpressionSyntax expressio
             switch (expression)
             {
                 case JassDecimalLiteralExpressionSyntax decimalLiteralExpression:
-                    value = decimalLiteralExpression.Value;
+                    value = (int)decimalLiteralExpression.Value;
                     return true;
 
                 case JassOctalLiteralExpressionSyntax octalLiteralExpression:

diff --git a/src/War3Net.CodeAnalysis.Jass/Parser/DecimalLiteralExpressionParser.cs b/src/War3Net.CodeAnalysis.Jass/Parser/DecimalLiteralExpressionParser.cs
@@ -17,9 +17,17 @@ internal partial class JassParser
     {
         internal static Parser<char, IExpressionSyntax> GetDecimalLiteralExpressionParser()
         {
-            return Try(UnsignedInt(10))
-                .Select<IExpressionSyntax>(value => new JassDecimalLiteralExpressionSyntax(value))
+            return Try(UnsignedLong(10)
+                .Bind(value =>
+                    value - 1 == int.MaxValue
+                        ? Parser<char>.Return<IExpressionSyntax>(new JassDecimalLiteralExpressionSyntax(value))
+                        : Parser<char>.Fail<IExpressionSyntax>("Edge case only. Fall-through to UnsignedInt")
+                ))
+                .Or(
+                    Try(UnsignedInt(10)
+                        .Select<IExpressionSyntax>(value => new JassDecimalLiteralExpressionSyntax(value)))
+                )
                 .Labelled("decimal literal");
-        }
+       }
     }
 }
diff --git a/src/War3Net.CodeAnalysis.Jass/Syntax/JassDecimalLiteralExpressionSyntax.cs b/src/War3Net.CodeAnalysis.Jass/Syntax/JassDecimalLiteralExpressionSyntax.cs
@@ -5,18 +5,25 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
+using System;
 using System.Globalization;
 
 namespace War3Net.CodeAnalysis.Jass.Syntax
 {
     public class JassDecimalLiteralExpressionSyntax : IExpressionSyntax
     {
-        public JassDecimalLiteralExpressionSyntax(int value)
+        public JassDecimalLiteralExpressionSyntax(long value)
         {
+            if (value < Int32.MinValue || value-1 > Int32.MaxValue)
+            {
+                //workaround to allow -2147483648 to be wrapped as new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassDecimalLiteralExpressionSyntax(2147483648))
+                throw new ArgumentException();
+            }
+
             Value = value;
         }
 
-        public int Value { get; init; }
+        public long Value { get; init; }
 
         public bool Equals(IExpressionSyntax? other)
         {

diff --git a/tests/War3Net.CodeAnalysis.Jass.Tests/Parser/ExpressionParserTests.cs b/tests/War3Net.CodeAnalysis.Jass.Tests/Parser/ExpressionParserTests.cs
@@ -196,6 +196,9 @@ public void TestExpressionParser(string expression, IExpressionSyntax? expected
             #endregion
 
             #region UnaryExpression
+            yield return new object?[] { @"-2147483647", new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassDecimalLiteralExpressionSyntax(2147483647)) };
+            yield return new object?[] { @"-2147483648", new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassDecimalLiteralExpressionSyntax(2147483648)) };
+            yield return new object?[] { @"--2147483648", new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassDecimalLiteralExpressionSyntax(2147483648))) };
             yield return new object?[] { @"+6", new JassUnaryExpressionSyntax(UnaryOperatorType.Plus, new JassDecimalLiteralExpressionSyntax(6)) };
             yield return new object?[] { @"-7", new JassUnaryExpressionSyntax(UnaryOperatorType.Minus, new JassDecimalLiteralExpressionSyntax(7)) };
             yield return new object?[] { @"+ 6", new JassUnaryExpressionSyntax(UnaryOperatorType.Plus, new JassDecimalLiteralExpressionSyntax(6)) };