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

fix #8011

Browse source
This commit is contained in:
Arne Döring 2018-11-08 17:07:02 +01:00 • committed by Andreas Rumpf
commit 16353c2ac8
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ccgtypes.nim
View file

@ -146,6 +146,8 @@ proc mapType(conf: ConfigRef; typ: PType): TCTypeKind =
return mapType(conf, typ.lastSon) return mapType(conf, typ.lastSon)
of tyGenericBody, tyGenericInst, tyGenericParam, tyDistinct, tyOrdinal, of tyGenericBody, tyGenericInst, tyGenericParam, tyDistinct, tyOrdinal,
tyTypeDesc, tyAlias, tySink, tyInferred: tyTypeDesc, tyAlias, tySink, tyInferred:
if typ.sons.len == 0:
internalError(conf, "typ has no last son")
result = mapType(conf, lastSon(typ)) result = mapType(conf, lastSon(typ))
of tyEnum: of tyEnum:
if firstOrd(conf, typ) < 0: if firstOrd(conf, typ) < 0:

6
compiler/semstmts.nim
View file

@ -41,8 +41,12 @@ proc semDiscard(c: PContext, n: PNode): PNode =
checkSonsLen(n, 1, c.config) checkSonsLen(n, 1, c.config)
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])
if isEmptyType(n.sons[0].typ) or n.sons[0].typ.kind == tyNone or n.sons[0].kind == nkTypeOfExpr: let sonType = n.sons[0].typ
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:
# tyProc is disallowed to prevent ``discard foo`` to pass, when ``discard foo()`` is meant.
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 =
result = n result = n