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

more intelligent handling of 'discardable'

Browse source
This commit is contained in:
Araq 2013-05-07 11:13:29 +02:00
commit cb51c1a0e7
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/semstmts.nim
View file

@ -107,16 +107,14 @@ proc semExprBranchScope(c: PContext, n: PNode): PNode =
result = semExprBranch(c, n) result = semExprBranch(c, n)
closeScope(c.tab) closeScope(c.tab)
proc meaningfulStmt(n: PNode): PNode = const
assert n.kind == nkStmtListExpr skipForDiscardable = {nkIfStmt, nkIfExpr, nkCaseStmt, nkOfBranch,
var last = n.len-1 nkElse, nkStmtListExpr, nkTryStmt, nkFinally, nkExceptBranch,
while last > 0 and n.sons[last].kind in {nkPragma, nkCommentStmt, nkEmpty}: nkElifBranch, nkElifExpr, nkElseExpr, nkBlockStmt, nkBlockExpr}
dec last
result = n.sons[last]
proc ImplicitlyDiscardable(n: PNode): bool = proc ImplicitlyDiscardable(n: PNode): bool =
var n = n var n = n
while n.kind == nkStmtListExpr: n = meaningfulStmt(n) while n.kind in skipForDiscardable: n = n.lastSon
result = isCallExpr(n) and n.sons[0].kind == nkSym and result = isCallExpr(n) and n.sons[0].kind == nkSym and
sfDiscardable in n.sons[0].sym.flags sfDiscardable in n.sons[0].sym.flags
@ -136,7 +134,7 @@ proc discardCheck(result: PNode) =
elif ImplicitlyDiscardable(result): elif ImplicitlyDiscardable(result):
var n = result var n = result
result.typ = nil result.typ = nil
while n.kind == nkStmtListExpr: while n.kind in skipForDiscardable:
n = n.lastSon n = n.lastSon
n.typ = nil n.typ = nil
elif result.typ.kind != tyError and gCmd != cmdInteractive: elif result.typ.kind != tyError and gCmd != cmdInteractive: