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

Fixup #5240 (#5270)

Browse source
This commit is contained in:
Yuriy Glukhov 2017-01-23 21:09:43 +02:00 • committed by Andreas Rumpf
commit 268c899b98
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/jsgen.nim
View file

@ -1374,7 +1374,7 @@ proc createRecordVarAux(p: PProc, rec: PNode, excludedFieldIDs: IntSet, output:
if rec.sym.id notin excludedFieldIDs: if rec.sym.id notin excludedFieldIDs:
if output.len > 0: output.add(", ") if output.len > 0: output.add(", ")
if p.target == targetJS: if p.target == targetJS:
output.addf("'$#': ", [mangleName(rec.sym, p.target)]) output.addf("$#: ", [mangleName(rec.sym, p.target)])
else: else:
output.addf("'$#' => ", [mangleName(rec.sym, p.target)]) output.addf("'$#' => ", [mangleName(rec.sym, p.target)])
output.add(createVar(p, rec.sym.typ, false)) output.add(createVar(p, rec.sym.typ, false))
@ -1883,7 +1883,7 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
var f = it.sons[0].sym var f = it.sons[0].sym
if f.loc.r == nil: f.loc.r = mangleName(f, p.target) if f.loc.r == nil: f.loc.r = mangleName(f, p.target)
fieldIDs.incl(f.id) fieldIDs.incl(f.id)
addf(initList, "'$#': $#" | "'$#' => $#" , [f.loc.r, a.res]) addf(initList, "$#: $#" | "'$#' => $#" , [f.loc.r, a.res])
let t = skipTypes(n.typ, abstractInst + skipPtrs) let t = skipTypes(n.typ, abstractInst + skipPtrs)
createObjInitList(p, t, fieldIDs, initList) createObjInitList(p, t, fieldIDs, initList)
r.res = ("{$1}" | "array($#)") % [initList] r.res = ("{$1}" | "array($#)") % [initList]