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

ConditionExpression: setup operator precedences

Browse Source
This commit is contained in:
atlimit8
2017-02-14 10:45:38 -06:00
parent 0fc2008f10
commit bbea7642fc
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,11 +129,14 @@ namespace OpenRA.Support
enum Precedence enum Precedence
{ {
Invalid = ~0, Unary = 16,
Parens = -1, Equality = 8,
And = 4,
Or = 3,
Binary = 0,
Value = 0, Value = 0,
Unary = 1, Parens = -1,
Binary = 0 Invalid = ~0
} }
struct TokenTypeInfo struct TokenTypeInfo
@@ -197,16 +200,16 @@ namespace OpenRA.Support
yield return new TokenTypeInfo("!", Precedence.Unary, OperandSides.Right, Associativity.Right); yield return new TokenTypeInfo("!", Precedence.Unary, OperandSides.Right, Associativity.Right);
continue; continue;
case TokenType.And: case TokenType.And:
yield return new TokenTypeInfo("&&", Precedence.Binary, OperandSides.Both); yield return new TokenTypeInfo("&&", Precedence.And, OperandSides.Both);
continue; continue;
case TokenType.Or: case TokenType.Or:
yield return new TokenTypeInfo("||", Precedence.Binary, OperandSides.Both); yield return new TokenTypeInfo("||", Precedence.Or, OperandSides.Both);
continue; continue;
case TokenType.Equals: case TokenType.Equals:
yield return new TokenTypeInfo("==", Precedence.Binary, OperandSides.Both); yield return new TokenTypeInfo("==", Precedence.Equality, OperandSides.Both);
continue; continue;
case TokenType.NotEquals: case TokenType.NotEquals:
yield return new TokenTypeInfo("!=", Precedence.Binary, OperandSides.Both); yield return new TokenTypeInfo("!=", Precedence.Equality, OperandSides.Both);
continue; continue;
} }