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

genSym symbols rendered as b1_416049 instead of b1416049 (#11960)

Browse source
This commit is contained in:
Timothee Cour 2019-08-16 03:17:20 -07:00 • committed by Andreas Rumpf
commit cf22dec584
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/renderer.nim
View file

@ -739,13 +739,18 @@ proc gcase(g: var TSrcGen, n: PNode) =
if longMode(g, n.sons[length - 1]): incl(c.flags, rfLongMode) if longMode(g, n.sons[length - 1]): incl(c.flags, rfLongMode)
gsub(g, n.sons[length - 1], c) gsub(g, n.sons[length - 1], c)
proc genSymSuffix(result: var string, s: PSym) {.inline.} =
if sfGenSym in s.flags:
result.add '_'
result.addInt s.id
proc gproc(g: var TSrcGen, n: PNode) = proc gproc(g: var TSrcGen, n: PNode) =
var c: TContext var c: TContext
if n.sons[namePos].kind == nkSym: if n.sons[namePos].kind == nkSym:
let s = n.sons[namePos].sym let s = n.sons[namePos].sym
put(g, tkSymbol, renderDefinitionName(s)) var ret = renderDefinitionName(s)
if sfGenSym in s.flags: ret.genSymSuffix(s)
put(g, tkIntLit, $s.id) put(g, tkSymbol, ret)
else: else:
gsub(g, n.sons[namePos]) gsub(g, n.sons[namePos])
@ -839,12 +844,12 @@ proc gident(g: var TSrcGen, n: PNode) =
t = tkSymbol t = tkSymbol
else: else:
t = tkOpr t = tkOpr
put(g, t, s, if n.kind == nkSym and renderSyms in g.flags: n.sym else: nil)
if n.kind == nkSym and (renderIds in g.flags or sfGenSym in n.sym.flags or n.sym.kind == skTemp): if n.kind == nkSym and (renderIds in g.flags or sfGenSym in n.sym.flags or n.sym.kind == skTemp):
s.genSymSuffix(n.sym)
when defined(debugMagics): when defined(debugMagics):
put(g, tkIntLit, $n.sym.id & $n.sym.magic) s.add '_'
else: s.add $n.sym.magic
put(g, tkIntLit, $n.sym.id) put(g, t, s, if n.kind == nkSym and renderSyms in g.flags: n.sym else: nil)
proc doParamsAux(g: var TSrcGen, params: PNode) = proc doParamsAux(g: var TSrcGen, params: PNode) =
if params.len > 1: if params.len > 1: