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

make tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2018-09-24 12:14:43 +02:00
commit 9364369c1f
9 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/sem.nim
View file

@ -542,12 +542,20 @@ proc isImportSystemStmt(g: ModuleGraph; n: PNode): bool =
return true
else: discard
proc isEmptyTree(n: PNode): bool =
case n.kind
of nkStmtList:
for it in n:
if not isEmptyTree(it): return false
result = true
of nkEmpty, nkCommentStmt: result = true
else: result = false
proc semStmtAndGenerateGenerics(c: PContext, n: PNode): PNode =
if n.kind == nkDefer:
localError(c.config, n.info, "defer statement not supported at top level")
if c.topStmts == 0 and not isImportSystemStmt(c.graph, n):
if sfSystemModule notin c.module.flags and
n.kind notin {nkEmpty, nkCommentStmt}:
if sfSystemModule notin c.module.flags and not isEmptyTree(n):
c.importTable.addSym c.graph.systemModule # import the "System" identifier
importAllSymbols(c, c.graph.systemModule)
inc c.topStmts