epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VariableExpression: hyphen after digit lexing fix

Browse Source
This commit is contained in:
atlimit8
2017-04-15 09:29:30 -05:00
parent afc1f22c63
commit f9974624c8
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Support/VariableExpression.cs
View File

@@ -320,7 +320,7 @@ namespace OpenRA.Support
cc = CharClassOf(expression[i]); cc = CharClassOf(expression[i]);
if (cc != CharClass.Digit) if (cc != CharClass.Digit)
{ {
if (cc != CharClass.Whitespace && cc != CharClass.Operator) if (cc != CharClass.Whitespace && cc != CharClass.Operator && cc != CharClass.Mixed)
throw new InvalidDataException("Number {0} and variable merged at index {1}".F( throw new InvalidDataException("Number {0} and variable merged at index {1}".F(
int.Parse(expression.Substring(start, i - start)), start)); int.Parse(expression.Substring(start, i - start)), start));

22
OpenRA.Test/OpenRA.Game/VariableExpressionTest.cs
View File

@@ -23,6 +23,8 @@ namespace OpenRA.Test
{ {
IReadOnlyDictionary<string, int> testValues = new ReadOnlyDictionary<string, int>(new Dictionary<string, int>() IReadOnlyDictionary<string, int> testValues = new ReadOnlyDictionary<string, int>(new Dictionary<string, int>()
{ {
{ "t", 5 },
{ "t-1", 7 },
{ "one", 1 }, { "one", 1 },
{ "five", 5 } { "five", 5 }
}); });
@@ -295,6 +297,16 @@ namespace OpenRA.Test
AssertValue("~(~2 + ~3)", 6); AssertValue("~(~2 + ~3)", 6);
} }
[TestCase(TestName = "Hyphen")]
public void TestHyphen()
{
AssertValue("t-1", 7);
AssertValue("-t-1", -7);
AssertValue("t - 1", 4);
AssertValue("-1", -1);
AssertValue("6- 3", 3);
}
[TestCase(TestName = "Parenthesis and mixed operations")] [TestCase(TestName = "Parenthesis and mixed operations")]
public void TestMixedParens() public void TestMixedParens()
{ {
@@ -333,7 +345,17 @@ namespace OpenRA.Test
AssertParseFailure("false ||", "Missing value or sub-expression at end for `||` operator"); AssertParseFailure("false ||", "Missing value or sub-expression at end for `||` operator");
AssertParseFailure("1 <", "Missing value or sub-expression at end for `<` operator"); AssertParseFailure("1 <", "Missing value or sub-expression at end for `<` operator");
AssertParseFailure("-1a", "Number -1 and variable merged at index 0"); AssertParseFailure("-1a", "Number -1 and variable merged at index 0");
}
[TestCase(TestName = "Test hyphen parser errors")]
public void TestParseHyphenErrors()
{
AssertParseFailure("-", "Missing value or sub-expression at end for `-` operator"); AssertParseFailure("-", "Missing value or sub-expression at end for `-` operator");
AssertParseFailure("t- 1", "Missing binary operation before `1` at index 3");
AssertParseFailure("t -1", "Missing binary operation before `-1` at index 2");
AssertParseFailure("-1-1", "Missing binary operation before `-1` at index 2");
AssertParseFailure("5-1", "Missing binary operation before `-1` at index 1");
AssertParseFailure("6 -3", "Missing binary operation before `-3` at index 2");
} }
[TestCase(TestName = "Undefined symbols are treated as `false` (0) values")] [TestCase(TestName = "Undefined symbols are treated as `false` (0) values")]