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

nimsuggest: make tests green again

Browse source
This commit is contained in:
Araq 2017-03-10 00:18:24 +01:00
commit 556b564c7d
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ast.nim
View file

@ -736,7 +736,7 @@ type
TLibKind* = enum TLibKind* = enum
libHeader, libDynamic libHeader, libDynamic
TLib* = object # also misused for headers! TLib* = object # also misused for headers!
kind*: TLibKind kind*: TLibKind
generated*: bool # needed for the backends: generated*: bool # needed for the backends:
@ -744,7 +744,7 @@ type
name*: Rope name*: Rope
path*: PNode # can be a string literal! path*: PNode # can be a string literal!
CompilesId* = int ## id that is used for the caching logic within CompilesId* = int ## id that is used for the caching logic within
## ``system.compiles``. See the seminst module. ## ``system.compiles``. See the seminst module.
TInstantiation* = object TInstantiation* = object

4
compiler/parser.nim
View file

@ -2002,12 +2002,12 @@ proc parseStmt(p: var TParser): PNode =
break break
p.hasProgress = false p.hasProgress = false
var a = complexOrSimpleStmt(p) var a = complexOrSimpleStmt(p)
if not p.hasProgress and p.tok.tokType == tkEof: break if a.kind != nkEmpty:
if a.kind != nkEmpty and p.hasProgress:
addSon(result, a) addSon(result, a)
else: else:
parMessage(p, errExprExpected, p.tok) parMessage(p, errExprExpected, p.tok)
getTok(p) getTok(p)
if not p.hasProgress and p.tok.tokType == tkEof: break
else: else:
# the case statement is only needed for better error messages: # the case statement is only needed for better error messages:
case p.tok.tokType case p.tok.tokType

2
nimsuggest/nimsuggest.nim
View file

@ -424,7 +424,7 @@ proc execCmd(cmd: string; graph: ModuleGraph; cache: IdentCache; cachedMsgs: Cac
else: else:
if gIdeCmd == ideChk: if gIdeCmd == ideChk:
for cm in cachedMsgs: errorHook(cm.info, cm.msg, cm.sev) for cm in cachedMsgs: errorHook(cm.info, cm.msg, cm.sev)
execute(gIdeCmd, orig, dirtyfile, line, col-1, graph, cache) execute(gIdeCmd, orig, dirtyfile, line, col, graph, cache)
sentinel() sentinel()
proc recompileFullProject(graph: ModuleGraph; cache: IdentCache) = proc recompileFullProject(graph: ModuleGraph; cache: IdentCache) =