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

fixes #5015

Browse source
This commit is contained in:
Araq 2018-10-03 00:00:19 +02:00
commit c92fdb24c8
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/ccgexprs.nim
View file

@ -2079,7 +2079,7 @@ proc isConstClosure(n: PNode): bool {.inline.} =
n.sons[1].kind == nkNilLit
proc genClosure(p: BProc, n: PNode, d: var TLoc) =
assert n.kind == nkClosure
assert n.kind in {nkPar, nkTupleConstr, nkClosure}
if isConstClosure(n):
inc(p.module.labels)
@ -2337,7 +2337,9 @@ proc expr(p: BProc, n: PNode, d: var TLoc) =
else:
genArrayConstr(p, n, d)
of nkPar, nkTupleConstr:
if isDeepConstExpr(n) and n.len != 0:
if n.typ != nil and n.typ.kind == tyProc and n.len == 2:
genClosure(p, n, d)
elif isDeepConstExpr(n) and n.len != 0:
exprComplexConst(p, n, d)
else:
genTupleConstr(p, n, d)