Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix Jass Parser converting -2147483648 to --2147483648 #63

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug fix Jass Parser converting -2147483648 to --2147483648 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/War3Net.CodeAnalysis.Decompilers/Script/MapTriggersDecompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/War3Net.CodeAnalysis.Jass/Extensions/ExpressionSyntaxExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 11 additions & 3 deletions src/War3Net.CodeAnalysis.Jass/Parser/DecimalLiteralExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}
}
11 changes: 9 additions & 2 deletions src/War3Net.CodeAnalysis.Jass/Syntax/JassDecimalLiteralExpressionSyntax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
3 changes: 3 additions & 0 deletions tests/War3Net.CodeAnalysis.Jass.Tests/Parser/ExpressionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) };
Expand Down