diff options
| author | Araq <rumpf_a@web.de> | 2018-05-16 03:06:07 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-05-16 03:06:07 +0200 |
| commit | 2a7fc84c86c48c6ca6354c8c2f9232c3f1a0b049 (patch) | |
| tree | 2831e8d6b75991bc522660ac7de406c1168d3050 /compiler/destroyer.nim | |
| parent | 479212995a615fc0a0827cc27756bb8cf865c1b0 (diff) | |
| download | Nim-2a7fc84c86c48c6ca6354c8c2f9232c3f1a0b049.tar.gz | |
remove ast.emptyNode global; cleanup configuration.nim
Diffstat (limited to 'compiler/destroyer.nim')
| -rw-r--r-- | compiler/destroyer.nim | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/destroyer.nim b/compiler/destroyer.nim index 31c735794..0dc90b552 100644 --- a/compiler/destroyer.nim +++ b/compiler/destroyer.nim @@ -132,6 +132,7 @@ type destroys, topLevelVars: PNode toDropBit: Table[int, PSym] graph: ModuleGraph + emptyNode: PNode proc getTemp(c: var Con; typ: PType; info: TLineInfo): PNode = # XXX why are temps fields in an object here? @@ -243,7 +244,7 @@ proc genDestroy(c: Con; t: PType; dest: PNode): PNode = genOp(t.destructor, "=destroy") proc addTopVar(c: var Con; v: PNode) = - c.topLevelVars.add newTree(nkIdentDefs, v, emptyNode, emptyNode) + c.topLevelVars.add newTree(nkIdentDefs, v, c.emptyNode, c.emptyNode) proc dropBit(c: var Con; s: PSym): PSym = result = c.toDropBit.getOrDefault(s.id) @@ -253,7 +254,7 @@ proc registerDropBit(c: var Con; s: PSym) = let result = newSym(skTemp, getIdent(s.name.s & "_AliveBit"), c.owner, s.info) result.typ = getSysType(c.graph, s.info, tyBool) let trueVal = newIntTypeNode(nkIntLit, 1, result.typ) - c.topLevelVars.add newTree(nkIdentDefs, newSymNode result, emptyNode, trueVal) + c.topLevelVars.add newTree(nkIdentDefs, newSymNode result, c.emptyNode, trueVal) c.toDropBit[s.id] = result # generate: # if not sinkParam_AliveBit: `=destroy`(sinkParam) @@ -328,7 +329,7 @@ proc destructiveMoveVar(n: PNode; c: var Con): PNode = var vpart = newNodeI(nkIdentDefs, tempAsNode.info, 3) vpart.sons[0] = tempAsNode - vpart.sons[1] = ast.emptyNode + vpart.sons[1] = c.emptyNode vpart.sons[2] = n add(v, vpart) @@ -434,6 +435,7 @@ proc injectDestructorCalls*(g: ModuleGraph; owner: PSym; n: PNode): PNode = c.topLevelVars = newNodeI(nkVarSection, n.info) c.toDropBit = initTable[int, PSym]() c.graph = g + c.emptyNode = newNodeI(nkEmpty, n.info) let cfg = constructCfg(owner, n) shallowCopy(c.g, cfg) c.jumpTargets = initIntSet() |