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

fixes another regression

Browse source
This commit is contained in:
Araq 2019-12-24 15:28:55 +01:00 • committed by Andreas Rumpf
commit 30162908b0
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/ccgexprs.nim
View file

@ -2877,8 +2877,15 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool): Rope =
of nkHiddenStdConv, nkHiddenSubConv: of nkHiddenStdConv, nkHiddenSubConv:
result = genBracedInit(p, n[1], isConst) result = genBracedInit(p, n[1], isConst)
else: else:
var t = skipTypes(n.typ, abstractInstOwned) var ty = tyNone
case t.kind if n.typ == nil:
if n.kind in nkStrKinds:
ty = tyString
else:
internalError(p.config, n.info, "node has no type")
else:
ty = skipTypes(n.typ, abstractInstOwned).kind
case ty
of tySet: of tySet:
var cs: TBitSet var cs: TBitSet
toBitSet(p.config, n, cs) toBitSet(p.config, n, cs)
@ -2889,7 +2896,7 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool): Rope =
else: else:
result = genConstSeq(p, n, n.typ, isConst) result = genConstSeq(p, n, n.typ, isConst)
of tyProc: of tyProc:
if t.callConv == ccClosure and n.len > 1 and n[1].kind == nkNilLit: if n.typ.callConv == ccClosure and n.len > 1 and n[1].kind == nkNilLit:
# Conversion: nimcall -> closure. # Conversion: nimcall -> closure.
# this hack fixes issue that nkNilLit is expanded to {NIM_NIL,NIM_NIL} # this hack fixes issue that nkNilLit is expanded to {NIM_NIL,NIM_NIL}
# this behaviour is needed since closure_var = nil must be # this behaviour is needed since closure_var = nil must be
@ -2902,7 +2909,7 @@ proc genBracedInit(p: BProc, n: PNode; isConst: bool): Rope =
else: else:
var d: TLoc var d: TLoc
initLocExpr(p, n[0], d) initLocExpr(p, n[0], d)
result = "{(($1) $2),NIM_NIL}" % [getClosureType(p.module, t, clHalfWithEnv), rdLoc(d)] result = "{(($1) $2),NIM_NIL}" % [getClosureType(p.module, n.typ, clHalfWithEnv), rdLoc(d)]
else: else:
var d: TLoc var d: TLoc
initLocExpr(p, n, d) initLocExpr(p, n, d)