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

Use switch statement for operator tokenization.

Browse Source
This commit is contained in:
atlimit8
2017-02-11 23:42:22 -06:00
parent 73895d07e2
commit c70442b15e
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OpenRA.Game/Support/ConditionExpression.cs
View File

@@ -166,53 +166,57 @@ namespace OpenRA.Support
static Token ParseSymbol(string expression, ref int i)
{
var start = i;
var c = expression[start];
// Parse operators
if (c == '!')
switch (expression[start])
{
if (i < expression.Length - 1 && expression[start + 1] == '=')
case '!':
{
i++;
return new NotEqualsToken(start);
if (i < expression.Length - 1 && expression[start + 1] == '=')
{
i++;
return new NotEqualsToken(start);
}
return new NotToken(start);
}
return new NotToken(start);
}
if (c == '=')
{
if (i < expression.Length - 1 && expression[start + 1] == '=')
case '=':
{
i++;
return new EqualsToken(start);
if (i < expression.Length - 1 && expression[start + 1] == '=')
{
i++;
return new EqualsToken(start);
}
throw new InvalidDataException("Unexpected character '=' at index {0}".F(start));
}
throw new InvalidDataException("Unexpected character '=' at index {0}".F(start));
}
if (c == '&')
{
if (i < expression.Length - 1 && expression[start + 1] == '&')
case '&':
{
i++;
return new AndToken(start);
if (i < expression.Length - 1 && expression[start + 1] == '&')
{
i++;
return new AndToken(start);
}
throw new InvalidDataException("Unexpected character '&' at index {0}".F(start));
}
throw new InvalidDataException("Unexpected character '&' at index {0}".F(start));
}
if (c == '|')
{
if (i < expression.Length - 1 && expression[start + 1] == '|')
case '|':
{
i++;
return new OrToken(start);
}
if (i < expression.Length - 1 && expression[start + 1] == '|')
{
i++;
return new OrToken(start);
}
throw new InvalidDataException("Unexpected character '|' at index {0}".F(start));
throw new InvalidDataException("Unexpected character '|' at index {0}".F(start));
}
}
var c = expression[start];
// Scan forwards until we find an non-digit character
if (c == '-' || char.IsDigit(expression[i]))
{