jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implemented arrow like operators

Browse source
This commit is contained in:
Araq 2014-12-08 08:56:44 +01:00
commit cd03f59432
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
compiler/parser.nim
View file

@ -188,18 +188,13 @@ proc parseTypeDesc(p: var TParser): PNode
proc parseDoBlocks(p: var TParser, call: PNode) proc parseDoBlocks(p: var TParser, call: PNode)
proc parseParamList(p: var TParser, retColon = true): PNode proc parseParamList(p: var TParser, retColon = true): PNode
proc relevantOprChar(ident: PIdent): char {.inline.} =
result = ident.s[0]
var L = ident.s.len
if result == '\\' and L > 1:
result = ident.s[1]
proc isSigilLike(tok: TToken): bool {.inline.} = proc isSigilLike(tok: TToken): bool {.inline.} =
result = tok.tokType == tkOpr and relevantOprChar(tok.ident) == '@' result = tok.tokType == tkOpr and tok.ident.s[0] == '@'
proc isLeftAssociative(tok: TToken): bool {.inline.} = proc isRightAssociative(tok: TToken): bool {.inline.} =
## Determines whether the token is left assocative. ## Determines whether the token is right assocative.
result = tok.tokType != tkOpr or relevantOprChar(tok.ident) != '^' result = tok.tokType == tkOpr and (tok.ident.s[0] == '^' or
(let L = tok.ident.s.len; L > 1 and tok.ident.s[L-1] == '>'))
proc getPrecedence(tok: TToken, strongSpaces: bool): int = proc getPrecedence(tok: TToken, strongSpaces: bool): int =
## Calculates the precedence of the given token. ## Calculates the precedence of the given token.
@ -209,7 +204,10 @@ proc getPrecedence(tok: TToken, strongSpaces: bool): int =
case tok.tokType case tok.tokType
of tkOpr: of tkOpr:
let L = tok.ident.s.len let L = tok.ident.s.len
let relevantChar = relevantOprChar(tok.ident) let relevantChar = tok.ident.s[0]
# arrow like?
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: considerStrongSpaces(value)
@ -270,16 +268,17 @@ proc checkBinary(p: TParser) {.inline.} =
#| optInd = COMMENT? #| optInd = COMMENT?
#| optPar = (IND{>} | IND{=})? #| optPar = (IND{>} | IND{=})?
#| #|
#| simpleExpr = assignExpr (OP0 optInd assignExpr)* #| simpleExpr = arrowExpr (OP0 optInd arrowExpr)*
#| assignExpr = orExpr (OP1 optInd orExpr)* #| arrowExpr = assignExpr (OP1 optInd assignExpr)*
#| orExpr = andExpr (OP2 optInd andExpr)* #| assignExpr = orExpr (OP2 optInd orExpr)*
#| andExpr = cmpExpr (OP3 optInd cmpExpr)* #| orExpr = andExpr (OP3 optInd andExpr)*
#| cmpExpr = sliceExpr (OP4 optInd sliceExpr)* #| andExpr = cmpExpr (OP4 optInd cmpExpr)*
#| sliceExpr = ampExpr (OP5 optInd ampExpr)* #| cmpExpr = sliceExpr (OP5 optInd sliceExpr)*
#| ampExpr = plusExpr (OP6 optInd plusExpr)* #| sliceExpr = ampExpr (OP6 optInd ampExpr)*
#| plusExpr = mulExpr (OP7 optInd mulExpr)* #| ampExpr = plusExpr (OP7 optInd plusExpr)*
#| mulExpr = dollarExpr (OP8 optInd dollarExpr)* #| plusExpr = mulExpr (OP8 optInd mulExpr)*
#| dollarExpr = primary (OP9 optInd primary)* #| mulExpr = dollarExpr (OP9 optInd dollarExpr)*
#| dollarExpr = primary (OP10 optInd primary)*
proc colcom(p: var TParser, n: PNode) = proc colcom(p: var TParser, n: PNode) =
eat(p, tkColon) eat(p, tkColon)
@ -734,7 +733,7 @@ proc parseOperators(p: var TParser, headNode: PNode,
# the operator itself must not start on a new line: # the operator itself must not start on a new line:
while opPrec >= limit and p.tok.indent < 0 and not isUnary(p): while opPrec >= limit and p.tok.indent < 0 and not isUnary(p):
checkBinary(p) checkBinary(p)
var leftAssoc = ord(isLeftAssociative(p.tok)) var leftAssoc = 1-ord(isRightAssociative(p.tok))
var a = newNodeP(nkInfix, p) var a = newNodeP(nkInfix, p)
var opNode = newIdentNodeP(p.tok.ident, p) # skip operator: var opNode = newIdentNodeP(p.tok.ident, p) # skip operator:
getTok(p) getTok(p)