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

Open a new scope for static: expr blocks (#10649)

Browse source 
Bring this in line with how plain blocks are analysed and avoids codegen
errors if one references variables defined in such a block.
This commit is contained in:
LemonBoy 2019-02-23 12:05:07 +01:00 • committed by Andreas Rumpf
commit e89aaaeaab
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semexprs.nim
View file

@ -735,7 +735,11 @@ proc evalAtCompileTime(c: PContext, n: PNode): PNode =
# echo "SUCCESS evaluated at compile time: ", call.renderTree
proc semStaticExpr(c: PContext, n: PNode): PNode =
let a = semExpr(c, n)
inc c.inStaticContext
openScope(c)
let a = semExprWithType(c, n)
closeScope(c)
dec c.inStaticContext
if a.findUnresolvedStatic != nil: return a
result = evalStaticExpr(c.module, c.graph, a, c.p.owner)
if result.isNil: