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

ConditionExpression: Added CharClass enum for tokenizing

Browse Source
This commit is contained in:
atlimit8
2017-02-12 12:23:53 -06:00
parent c70442b15e
commit f9e47cd0ca
1 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ namespace OpenRA.Support
default: default:
{ {
// Ignore whitespace // Ignore whitespace
if (char.IsWhiteSpace(expression[i])) if (CharClassOf(expression[i]) == CharClass.Whitespace)
break; break;
var token = ParseSymbol(expression, ref i); var token = ParseSymbol(expression, ref i);
@@ -163,6 +163,69 @@ namespace OpenRA.Support
postfix = ToPostfix(tokens).ToArray(); postfix = ToPostfix(tokens).ToArray();
} }
enum CharClass { Whitespace, Operator, Mixed, Id, Digit }
static CharClass CharClassOf(char c)
{
switch (c)
{
case '~':
case '!':
case '%':
case '^':
case '&':
case '*':
case '(':
case ')':
case '+':
case '=':
case '[':
case ']':
case '{':
case '}':
case '|':
case ':':
case ';':
case '\'':
case '"':
case '<':
case '>':
case '?':
case ',':
case '/':
return CharClass.Operator;
case '.':
case '$':
case '-':
case '@':
return CharClass.Mixed;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return CharClass.Digit;
// Fast-track normal whitespace
case ' ':
case '\t':
case '\n':
case '\r':
return CharClass.Whitespace;
// Should other whitespace be tested?
default:
return char.IsWhiteSpace(c) ? CharClass.Whitespace : CharClass.Id;
}
}
static Token ParseSymbol(string expression, ref int i) static Token ParseSymbol(string expression, ref int i)
{ {
var start = i; var start = i;
@@ -215,18 +278,18 @@ namespace OpenRA.Support
} }
} }
var c = expression[start]; var cc = CharClassOf(expression[start]);
// Scan forwards until we find an non-digit character // Scan forwards until we find an non-digit character
if (c == '-' || char.IsDigit(expression[i])) if (expression[start] == '-' || cc == CharClass.Digit)
{ {
i++; i++;
for (; i < expression.Length; i++) for (; i < expression.Length; i++)
{ {
c = expression[i]; cc = CharClassOf(expression[i]);
if (!char.IsDigit(c)) if (cc != CharClass.Digit)
{ {
if (!char.IsWhiteSpace(c) && c != '(' && c != ')' && c != '!' && c != '&' && c != '|' && c != '=' && c != '+') if (cc != CharClass.Whitespace && cc != CharClass.Operator)
throw new InvalidDataException("Number and variable merged at index {0}".F(start)); throw new InvalidDataException("Number and variable merged at index {0}".F(start));
// Put the bad character back for the next parse attempt // Put the bad character back for the next parse attempt
@@ -238,11 +301,14 @@ namespace OpenRA.Support
return new NumberToken(start, expression.Substring(start)); return new NumberToken(start, expression.Substring(start));
} }
if (cc != CharClass.Id)
throw new InvalidDataException("Invalid character at index {0}".F(start));
// Scan forwards until we find an invalid name character // Scan forwards until we find an invalid name character
for (; i < expression.Length; i++) for (; i < expression.Length; i++)
{ {
c = expression[i]; cc = CharClassOf(expression[i]);
if (char.IsWhiteSpace(c) || c == '(' || c == ')' || c == '!' || c == '&' || c == '|' || c == '=') if (cc == CharClass.Whitespace || cc == CharClass.Operator)
{ {
// Put the bad character back for the next parse attempt // Put the bad character back for the next parse attempt
i--; i--;