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

fix #9726 (#9765)

Browse source
This commit is contained in:
Arne Döring 2018-11-20 13:12:47 +01:00 • committed by GitHub
commit 39ad3a0da6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/semstmts.nim
View file

@ -42,10 +42,11 @@ proc semDiscard(c: PContext, n: PNode): PNode =
if n.sons[0].kind != nkEmpty: if n.sons[0].kind != nkEmpty:
n.sons[0] = semExprWithType(c, n.sons[0]) n.sons[0] = semExprWithType(c, n.sons[0])
let sonType = n.sons[0].typ let sonType = n.sons[0].typ
let sonKind = n.sons[0].kind
if isEmptyType(sonType) or sonType.kind == tyNone or n.sons[0].kind == nkTypeOfExpr: if isEmptyType(sonType) or sonType.kind == tyNone or n.sons[0].kind == nkTypeOfExpr:
localError(c.config, n.info, errInvalidDiscard) localError(c.config, n.info, errInvalidDiscard)
if sonType.kind == tyProc: if sonType.kind == tyProc and sonKind notin nkCallKinds:
# tyProc is disallowed to prevent ``discard foo`` to pass, when ``discard foo()`` is meant. # tyProc is disallowed to prevent ``discard foo`` to be valid, when ``discard foo()`` is meant.
localError(c.config, n.info, "illegal discard proc, did you mean: " & $n[0] & "()") localError(c.config, n.info, "illegal discard proc, did you mean: " & $n[0] & "()")
proc semBreakOrContinue(c: PContext, n: PNode): PNode = proc semBreakOrContinue(c: PContext, n: PNode): PNode =

8
tests/discard/tdiscardable.nim
View file

@ -27,3 +27,11 @@ proc bar(b: int):int =
echo foo(0) echo foo(0)
echo bar(0) echo bar(0)
# bug #9726
proc foo: (proc: int) =
proc bar: int = 1
return bar
discard foo()