Skip to content

don't collapse float()%1.0 to 0 #620

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

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

don't collapse float()%1.0 to 0 #620

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
11 changes: 9 additions & 2 deletions Source/Parser/Expressions/Trigger/ModifiedMemoryAccessorExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,10 @@ public ExpressionBase ApplyMathematic(ExpressionBase right, MathematicOperation

case RequirementOperator.Multiply: // a * 0 => 0
case RequirementOperator.BitwiseAnd: // a & 0 => 0
return new IntegerConstantExpression(0);
if (MemoryAccessor.Field.IsFloat)
return new FloatConstantExpression(0.0f);
else
return new IntegerConstantExpression(0);

case RequirementOperator.BitwiseXor: // a ^ 0 => a
ModifyingOperator = RequirementOperator.None;
Expand All @@ -620,7 +623,11 @@ public ExpressionBase ApplyMathematic(ExpressionBase right, MathematicOperation
break;

case RequirementOperator.Modulus: // a % 1 => 0
return new IntegerConstantExpression(0);
if (!MemoryAccessor.Field.IsFloat)
return new IntegerConstantExpression(0);

// float % 1 returns the fractional part
break;
}
}

Expand Down
40 changes: 40 additions & 0 deletions Tests/Parser/Expressions/Trigger/MemoryAccessorExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,46 @@ public void TestBuildTrigger(string input, string expected)
ExpressionType.MemoryAccessor, "byte(0x001234) & 0x000000F7")]
[TestCase("byte(0x001234)", "&", "0x0000007F",
ExpressionType.MemoryAccessor, "byte(0x001234) & 0x0000007F")]
[TestCase("byte(0x001234)", "*", "1",
ExpressionType.MemoryAccessor, "byte(0x001234)")]
[TestCase("byte(0x001234)", "*", "0",
ExpressionType.IntegerConstant, "0")]
[TestCase("byte(0x001234)", "*", "1.0",
ExpressionType.MemoryAccessor, "byte(0x001234)")]
[TestCase("byte(0x001234)", "*", "0.0",
ExpressionType.IntegerConstant, "0")]
[TestCase("byte(0x001234)", "/", "1",
ExpressionType.MemoryAccessor, "byte(0x001234)")]
[TestCase("byte(0x001234)", "/", "0",
ExpressionType.Error, "Division by zero")]
[TestCase("byte(0x001234)", "%", "1",
ExpressionType.IntegerConstant, "0")]
[TestCase("byte(0x001234)", "%", "0",
ExpressionType.Error, "Division by zero")]
[TestCase("byte(0x001234)", "%", "1.0",
ExpressionType.IntegerConstant, "0")]
[TestCase("byte(0x001234)", "&", "0",
ExpressionType.IntegerConstant, "0")]
[TestCase("byte(0x001234)", "^", "0",
ExpressionType.MemoryAccessor, "byte(0x001234)")]
[TestCase("float(0x001234)", "*", "1.0",
ExpressionType.MemoryAccessor, "float(0x001234)")]
[TestCase("float(0x001234)", "*", "0.0",
ExpressionType.FloatConstant, "0.0")]
[TestCase("float(0x001234)", "*", "1",
ExpressionType.MemoryAccessor, "float(0x001234)")]
[TestCase("float(0x001234)", "*", "0",
ExpressionType.FloatConstant, "0.0")]
[TestCase("float(0x001234)", "/", "1.0",
ExpressionType.MemoryAccessor, "float(0x001234)")]
[TestCase("float(0x001234)", "/", "0.0",
ExpressionType.Error, "Division by zero")]
[TestCase("float(0x001234)", "%", "1.0",
ExpressionType.MemoryAccessor, "float(0x001234) % 1.0")]
[TestCase("float(0x001234)", "%", "0.0",
ExpressionType.Error, "Division by zero")]
[TestCase("float(0x001234)", "%", "1",
ExpressionType.MemoryAccessor, "float(0x001234) % 1")]
public void TestCombine(string left, string operation, string right, ExpressionType expectedType, string expected)
{
// MemoryAccessorExpression.Combine just converts to a ModifiedMemoryAccessor and
Expand Down
Loading