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

fix #14007 (#14012) [backport]

Browse source 
Co-authored-by: cooldome <ariabushenko@bk.ru>
This commit is contained in:
cooldome 2020-04-18 15:15:17 +01:00 • committed by GitHub
commit d839eb9352
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/semfold.nim
View file

@ -722,7 +722,11 @@ proc getConstExpr(m: PSym, n: PNode; g: ModuleGraph): PNode =
of nkBracketExpr: result = foldArrayAccess(m, n, g) of nkBracketExpr: result = foldArrayAccess(m, n, g)
of nkDotExpr: result = foldFieldAccess(m, n, g) of nkDotExpr: result = foldFieldAccess(m, n, g)
of nkStmtListExpr: of nkStmtListExpr:
if n.len == 2 and n[0].kind == nkComesFrom: var i = 0
result = getConstExpr(m, n[1], g) while i <= n.len - 2:
if n[i].kind in {nkComesFrom, nkCommentStmt, nkEmpty}: i.inc
else: break
if i == n.len - 1:
result = getConstExpr(m, n[i], g)
else: else:
discard discard

9
tests/types/tyet_another_generic_regression.nim
View file

@ -30,3 +30,12 @@ const
}.toTable }.toTable
#map["test"]() #map["test"]()
#-------------------------------------------------------------------
# bug
const val = 10
type
t = object
when val >= 10:
a: int