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

VariableExpression: Restrict CharClass.Mixed to middle of identifiers

Browse Source
This commit is contained in:
atlimit8
2017-04-15 20:56:19 -05:00
parent f9974624c8
commit c34b947e43
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,6 +334,15 @@ namespace OpenRA.Support
return false; return false;
} }
static TokenType VariableOrKeyword(string expression, int start, ref int i)
{
if (CharClassOf(expression[i - 1]) == CharClass.Mixed)
throw new InvalidDataException("Invalid identifier end character at index {0} for `{1}`".F(
i - 1, expression.Substring(start, i - start)));
return VariableOrKeyword(expression, start, i - start);
}
static TokenType VariableOrKeyword(string expression, int start, int length) static TokenType VariableOrKeyword(string expression, int start, int length)
{ {
var i = start; var i = start;
@@ -464,10 +473,10 @@ namespace OpenRA.Support
{ {
cc = CharClassOf(expression[i]); cc = CharClassOf(expression[i]);
if (cc == CharClass.Whitespace || cc == CharClass.Operator) if (cc == CharClass.Whitespace || cc == CharClass.Operator)
return VariableOrKeyword(expression, start, i - start); return VariableOrKeyword(expression, start, ref i);
} }
return VariableOrKeyword(expression, start, i - start); return VariableOrKeyword(expression, start, ref i);
} }
public static Token GetNext(string expression, ref int i, TokenType lastType = TokenType.Invalid) public static Token GetNext(string expression, ref int i, TokenType lastType = TokenType.Invalid)

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

@@ -351,13 +351,24 @@ namespace OpenRA.Test
public void TestParseHyphenErrors() 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("-1-1", "Missing binary operation before `-1` at index 2");
AssertParseFailure("5-1", "Missing binary operation before `-1` at index 1"); AssertParseFailure("5-1", "Missing binary operation before `-1` at index 1");
AssertParseFailure("6 -3", "Missing binary operation before `-3` at index 2"); AssertParseFailure("6 -3", "Missing binary operation before `-3` at index 2");
} }
[TestCase(TestName = "Test mixed charaters at end of identifier parser errors")]
public void TestParseMixedEndErrors()
{
AssertParseFailure("t- 1", "Invalid identifier end character at index 1 for `t-`");
AssertParseFailure("t-", "Invalid identifier end character at index 1 for `t-`");
AssertParseFailure("t. 1", "Invalid identifier end character at index 1 for `t.`");
AssertParseFailure("t.", "Invalid identifier end character at index 1 for `t.`");
AssertParseFailure("t@ 1", "Invalid identifier end character at index 1 for `t@`");
AssertParseFailure("t@", "Invalid identifier end character at index 1 for `t@`");
AssertParseFailure("t$ 1", "Invalid identifier end character at index 1 for `t$`");
AssertParseFailure("t$", "Invalid identifier end character at index 1 for `t$`");
}
[TestCase(TestName = "Undefined symbols are treated as `false` (0) values")] [TestCase(TestName = "Undefined symbols are treated as `false` (0) values")]
public void TestUndefinedSymbols() public void TestUndefinedSymbols()
{ {