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

collapse to tables into one

Browse source
This commit is contained in:
Andrii Riabushenko 2018-12-05 22:17:19 +00:00
commit 135191d9d6
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/destroyer.nim
View file

@ -128,8 +128,8 @@ type
g: ControlFlowGraph g: ControlFlowGraph
jumpTargets: IntSet jumpTargets: IntSet
topLevelVars: PNode topLevelVars: PNode
destroys: OrderedTable[int, tuple[enabled: bool, destroy_call: PNode]] # Symbol to destructor table destroys: OrderedTable[int, tuple[enabled: bool, dropBit: PSym, destroy_call: PNode]]
toDropBit: Table[int, PSym] # Symbol to destructor call table
graph: ModuleGraph graph: ModuleGraph
emptyNode: PNode emptyNode: PNode
otherRead: PNode otherRead: PNode
@ -323,11 +323,11 @@ proc addTopVar(c: var Con; v: PNode) =
c.topLevelVars.add newTree(nkIdentDefs, v, c.emptyNode, c.emptyNode) c.topLevelVars.add newTree(nkIdentDefs, v, c.emptyNode, c.emptyNode)
proc dropBit(c: var Con; s: PSym): PSym = proc dropBit(c: var Con; s: PSym): PSym =
result = c.toDropBit.getOrDefault(s.id) result = c.destroys.getOrDefault(s.id).dropBit
assert result != nil assert result != nil
proc addDestructor(c: var Con; s: PSym; destructor_call: PNode) = proc addDestructor(c: var Con; s: PSym; destructor_call: PNode, dropBit: PSym = nil) =
let alreadyIn = c.destroys.hasKeyOrPut(s.id, (true, destructor_call)) let alreadyIn = c.destroys.hasKeyOrPut(s.id, (true, dropBit, destructor_call))
if alreadyIn: if alreadyIn:
let lineInfo = if s.ast != nil: s.ast.info else: c.owner.info let lineInfo = if s.ast != nil: s.ast.info else: c.owner.info
internalError(c.graph.config, lineInfo, "Destructor call for sym " & s.name.s & " is already injected") internalError(c.graph.config, lineInfo, "Destructor call for sym " & s.name.s & " is already injected")
@ -347,13 +347,12 @@ proc registerDropBit(c: var Con; s: PSym) =
result.typ = getSysType(c.graph, s.info, tyBool) result.typ = getSysType(c.graph, s.info, tyBool)
let trueVal = newIntTypeNode(nkIntLit, 1, result.typ) let trueVal = newIntTypeNode(nkIntLit, 1, result.typ)
c.topLevelVars.add newTree(nkIdentDefs, newSymNode result, c.emptyNode, trueVal) c.topLevelVars.add newTree(nkIdentDefs, newSymNode result, c.emptyNode, trueVal)
c.toDropBit[s.id] = result
# generate: # generate:
# if not sinkParam_AliveBit: `=destroy`(sinkParam) # if not sinkParam_AliveBit: `=destroy`(sinkParam)
let t = s.typ.skipTypes({tyGenericInst, tyAlias, tySink}) let t = s.typ.skipTypes({tyGenericInst, tyAlias, tySink})
if t.destructor != nil: if t.destructor != nil:
c.addDestructor(s, newTree(nkIfStmt, c.addDestructor(s, newTree(nkIfStmt,
newTree(nkElifBranch, newSymNode result, genDestroy(c, t, newSymNode s)))) newTree(nkElifBranch, newSymNode result, genDestroy(c, t, newSymNode s))), result)
proc getTemp(c: var Con; typ: PType; info: TLineInfo): PNode = proc getTemp(c: var Con; typ: PType; info: TLineInfo): PNode =
let sym = newSym(skTemp, getIdent(c.graph.cache, ":tmpD"), c.owner, info) let sym = newSym(skTemp, getIdent(c.graph.cache, ":tmpD"), c.owner, info)
@ -638,8 +637,7 @@ proc injectDestructorCalls*(g: ModuleGraph; owner: PSym; n: PNode): PNode =
var c: Con var c: Con
c.owner = owner c.owner = owner
c.topLevelVars = newNodeI(nkVarSection, n.info) c.topLevelVars = newNodeI(nkVarSection, n.info)
c.toDropBit = initTable[int, PSym](16) c.destroys = initOrderedTable[int, (bool, PSym, PNode)](16)
c.destroys = initOrderedTable[int, (bool, PNode)](16)
c.graph = g c.graph = g
c.emptyNode = newNodeI(nkEmpty, n.info) c.emptyNode = newNodeI(nkEmpty, n.info)
let cfg = constructCfg(owner, n) let cfg = constructCfg(owner, n)

1
lib/pure/collections/tables.nim
View file

@ -248,7 +248,6 @@ template withValue*[A, B](t: var Table[A, B], key: A,
else: else:
body2 body2
iterator allValues*[A, B](t: Table[A, B]; key: A): B = iterator allValues*[A, B](t: Table[A, B]; key: A): B =
## iterates over any value in the table ``t`` that belongs to the given ``key``. ## iterates over any value in the table ``t`` that belongs to the given ``key``.
var h: Hash = genHash(key) and high(t.data) var h: Hash = genHash(key) and high(t.data)