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

optional indentation for case statements

Browse source 
- preliminary support for try expressions  and case expressions
- allow do forms in assignments and return statements
This commit is contained in:
Zahary Karadjov 2012-05-23 02:27:57 +03:00
commit 4f45097f87
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/parser.nim
View file

@ -57,6 +57,8 @@ proc optInd*(p: var TParser, n: PNode)
proc indAndComment*(p: var TParser, n: PNode) proc indAndComment*(p: var TParser, n: PNode)
proc setBaseFlags*(n: PNode, base: TNumericalBase) proc setBaseFlags*(n: PNode, base: TNumericalBase)
proc parseSymbol*(p: var TParser): PNode proc parseSymbol*(p: var TParser): PNode
proc parseTry(p: var TParser): PNode
proc parseCase(p: var TParser): PNode
# implementation # implementation
proc getTok(p: var TParser) = proc getTok(p: var TParser) =
@ -468,6 +470,11 @@ proc primarySuffix(p: var TParser, r: PNode): PNode =
addSon(result, a) addSon(result, a)
exprColonEqExprListAux(p, nkExprEqExpr, tkParRi, tkEquals, result) exprColonEqExprListAux(p, nkExprEqExpr, tkParRi, tkEquals, result)
parseDoBlocks(p, result) parseDoBlocks(p, result)
of tkDo:
var a = result
result = newNodeP(nkCall, p)
addSon(result, a)
parseDoBlocks(p, result)
of tkDot: of tkDot:
result = dotExpr(p, result) result = dotExpr(p, result)
result = parseGStrLit(p, result) result = parseGStrLit(p, result)
@ -704,6 +711,8 @@ proc parseExpr(p: var TParser): PNode =
case p.tok.tokType: case p.tok.tokType:
of tkIf: result = parseIfExpr(p, nkIfExpr) of tkIf: result = parseIfExpr(p, nkIfExpr)
of tkWhen: result = parseIfExpr(p, nkWhenExpr) of tkWhen: result = parseIfExpr(p, nkWhenExpr)
of tkTry: result = parseTry(p)
of tkCase: result = parseCase(p)
else: result = lowestExpr(p) else: result = lowestExpr(p)
proc primary(p: var TParser, skipSuffix = false): PNode = proc primary(p: var TParser, skipSuffix = false): PNode =
@ -944,13 +953,19 @@ proc parseWhile(p: var TParser): PNode =
proc parseCase(p: var TParser): PNode = proc parseCase(p: var TParser): PNode =
var var
b: PNode b: PNode
inElif: bool inElif= false
wasIndented = false
result = newNodeP(nkCaseStmt, p) result = newNodeP(nkCaseStmt, p)
getTok(p) getTok(p)
addSon(result, parseExpr(p)) addSon(result, parseExpr(p))
if p.tok.tokType == tkColon: getTok(p) if p.tok.tokType == tkColon: getTok(p)
skipComment(p, result) skipComment(p, result)
inElif = false
if p.tok.tokType == tkInd:
pushInd(p.lex, p.tok.indent)
getTok(p)
wasIndented = true
while true: while true:
if p.tok.tokType == tkSad: getTok(p) if p.tok.tokType == tkSad: getTok(p)
case p.tok.tokType case p.tok.tokType
@ -973,8 +988,12 @@ proc parseCase(p: var TParser): PNode =
skipComment(p, b) skipComment(p, b)
addSon(b, parseStmt(p)) addSon(b, parseStmt(p))
addSon(result, b) addSon(result, b)
if b.kind == nkElse: break if b.kind == nkElse: break
if wasIndented:
eat(p, tkDed)
popInd(p.lex)
proc parseTry(p: var TParser): PNode = proc parseTry(p: var TParser): PNode =
result = newNodeP(nkTryStmt, p) result = newNodeP(nkTryStmt, p)
getTok(p) getTok(p)