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

don't raise index defects on malformed ast (#15278)

Browse source 
* don't raise index defects on malformed ast

* style
This commit is contained in:
Andy Davidoff 2020-09-07 14:04:07 -04:00 • committed by GitHub
commit 0b74d26d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/semcall.nim
View file

@ -495,9 +495,14 @@ proc updateDefaultParams(call: PNode) =
proc getCallLineInfo(n: PNode): TLineInfo = proc getCallLineInfo(n: PNode): TLineInfo =
case n.kind case n.kind
of nkAccQuoted, nkBracketExpr, nkCall, nkCallStrLit, nkCommand: of nkAccQuoted, nkBracketExpr, nkCall, nkCallStrLit, nkCommand:
getCallLineInfo(n[0]) if len(n) > 0:
of nkDotExpr: getCallLineInfo(n[1]) return getCallLineInfo(n[0])
else: n.info of nkDotExpr:
if len(n) > 1:
return getCallLineInfo(n[1])
else:
discard
result = n.info
proc semResolvedCall(c: PContext, x: TCandidate, proc semResolvedCall(c: PContext, x: TCandidate,
n: PNode, flags: TExprFlags): PNode = n: PNode, flags: TExprFlags): PNode =

9
compiler/semstmts.nim
View file

@ -324,11 +324,14 @@ proc semIdentDef(c: PContext, n: PNode, kind: TSymKind): PSym =
proc getLineInfo(n: PNode): TLineInfo = proc getLineInfo(n: PNode): TLineInfo =
case n.kind case n.kind
of nkPostfix: of nkPostfix:
getLineInfo(n[1]) if len(n) > 1:
return getLineInfo(n[1])
of nkAccQuoted, nkPragmaExpr: of nkAccQuoted, nkPragmaExpr:
getLineInfo(n[0]) if len(n) > 0:
return getLineInfo(n[0])
else: else:
n.info discard
result = n.info
let info = getLineInfo(n) let info = getLineInfo(n)
suggestSym(c.config, info, result, c.graph.usageSym) suggestSym(c.config, info, result, c.graph.usageSym)