Refactored getPrecedence() after last change

The considerStrongSpaces() is now applied to almost all results, so it is better to do it at the end.
This commit is contained in:
ReneSac 2015-04-08 02:06:18 -03:00
commit 80050a09a0

View file

@ -215,25 +215,25 @@ proc getPrecedence(tok: TToken, strongSpaces: bool): int =
if L > 1 and tok.ident.s[L-1] == '>': return considerStrongSpaces(1) if L > 1 and tok.ident.s[L-1] == '>': return considerStrongSpaces(1)
template considerAsgn(value: expr) = template considerAsgn(value: expr) =
result = if tok.ident.s[L-1] == '=': 1 else: considerStrongSpaces(value) result = if tok.ident.s[L-1] == '=': 1 else: value
case relevantChar case relevantChar
of '$', '^': considerAsgn(10) of '$', '^': considerAsgn(10)
of '*', '%', '/', '\\': considerAsgn(9) of '*', '%', '/', '\\': considerAsgn(9)
of '~': result = considerStrongSpaces(8) of '~': result = 8
of '+', '-', '|': considerAsgn(8) of '+', '-', '|': considerAsgn(8)
of '&': considerAsgn(7) of '&': considerAsgn(7)
of '=', '<', '>', '!': result = considerStrongSpaces(5) of '=', '<', '>', '!': result = 5
of '.': considerAsgn(6) of '.': considerAsgn(6)
of '?': result = considerStrongSpaces(2) of '?': result = 2
else: considerAsgn(2) else: considerAsgn(2)
of tkDiv, tkMod, tkShl, tkShr: result = considerStrongSpaces(9) of tkDiv, tkMod, tkShl, tkShr: result = 9
of tkIn, tkNotin, tkIs, tkIsnot, tkNot, tkOf, tkAs: of tkIn, tkNotin, tkIs, tkIsnot, tkNot, tkOf, tkAs: result = 5
result = considerStrongSpaces(5) of tkDotDot: result = 6
of tkDotDot: result = considerStrongSpaces(6) of tkAnd: result = 4
of tkAnd: result = considerStrongSpaces(4) of tkOr, tkXor, tkPtr, tkRef: result = 3
of tkOr, tkXor, tkPtr, tkRef: result = considerStrongSpaces(3) else: return -10
else: result = -10 result = considerStrongSpaces(result)
proc isOperator(tok: TToken): bool = proc isOperator(tok: TToken): bool =
## Determines if the given token is an operator type token. ## Determines if the given token is an operator type token.