diff options
| -rwxr-xr-x | compiler/transf.nim | 8 | ||||
| -rw-r--r-- | lib/pure/collections/sets.nim | 4 | ||||
| -rw-r--r-- | lib/pure/collections/tables.nim | 22 | ||||
| -rwxr-xr-x | todo.txt | 3 |
4 files changed, 26 insertions, 11 deletions
diff --git a/compiler/transf.nim b/compiler/transf.nim index 6c3aea0b3..9e38822c7 100755 --- a/compiler/transf.nim +++ b/compiler/transf.nim @@ -342,23 +342,15 @@ proc transformAddrDeref(c: PTransf, n: PNode, a, b: TNodeKind): PTransNode = var x = copyTree(n) x.sons[0].sons[0] = m.sons[0] result = transform(c, x.sons[0]) - - #result = newTransNode(n.sons[0]) - #result[0] = transform(c, m.sons[0]) else: result = transformSons(c, n) of nkHiddenStdConv, nkHiddenSubConv, nkConv: var m = n.sons[0].sons[1] if (m.kind == a) or (m.kind == b): # addr ( nkConv ( deref ( x ) ) ) --> nkConv(x) - var x = copyTree(n) x.sons[0].sons[1] = m.sons[0] result = transform(c, x.sons[0]) - - #result = newTransNode(n.sons[0]) - #result[1] = transform(c, m.sons[0]) - else: result = transformSons(c, n) else: diff --git a/lib/pure/collections/sets.nim b/lib/pure/collections/sets.nim index 331881d88..a577964c9 100644 --- a/lib/pure/collections/sets.nim +++ b/lib/pure/collections/sets.nim @@ -26,7 +26,7 @@ type TSlotEnum = enum seEmpty, seFilled, seDeleted TKeyValuePair[A] = tuple[slot: TSlotEnum, key: A] TKeyValuePairSeq[A] = seq[TKeyValuePair[A]] - TSet* {.final, myShallow.}[A] = object + TSet* {.final, myShallow.}[A] = object ## a generic hash set data: TKeyValuePairSeq[A] counter: int @@ -141,7 +141,7 @@ proc `$`*[A](s: TSet[A]): string = ## The `$` operator for hash sets. dollarImpl() -# ------------------------------ ordered table ------------------------------ +# ------------------------------ ordered set ------------------------------ type TOrderedKeyValuePair[A] = tuple[ diff --git a/lib/pure/collections/tables.nim b/lib/pure/collections/tables.nim index d1ed7586a..d353db3fb 100644 --- a/lib/pure/collections/tables.nim +++ b/lib/pure/collections/tables.nim @@ -102,19 +102,37 @@ proc Enlarge[A, B](t: var TTable[A, B]) = if t.data[i].slot == seFilled: RawInsert(t, n, t.data[i].key, t.data[i].val) swap(t.data, n) +template AddImpl() = + if mustRehash(len(t.data), t.counter): Enlarge(t) + RawInsert(t, t.data, key, val) + inc(t.counter) + template PutImpl() = var index = RawGet(t, key) if index >= 0: t.data[index].val = val else: + AddImpl() + +template HasKeyOrPutImpl() = + var index = RawGet(t, key) + if index >= 0: + t.data[index].val = val + result = true + else: if mustRehash(len(t.data), t.counter): Enlarge(t) RawInsert(t, t.data, key, val) inc(t.counter) + result = false proc `[]=`*[A, B](t: var TTable[A, B], key: A, val: B) = ## puts a (key, value)-pair into `t`. putImpl() +proc add*[A, B](t: var TTable[A, B], key: A, val: B) = + ## puts a new (key, value)-pair into `t` even if ``t[key]`` already exists. + AddImpl() + proc del*[A, B](t: var TTable[A, B], key: A) = ## deletes `key` from hash table `t`. var index = RawGet(t, key) @@ -230,6 +248,10 @@ proc `[]=`*[A, B](t: var TOrderedTable[A, B], key: A, val: B) = ## puts a (key, value)-pair into `t`. putImpl() +proc add*[A, B](t: var TOrderedTable[A, B], key: A, val: B) = + ## puts a new (key, value)-pair into `t` even if ``t[key]`` already exists. + AddImpl() + proc initOrderedTable*[A, B](initialSize=64): TOrderedTable[A, B] = ## creates a new ordered hash table that is empty. `initialSize` needs to be ## a power of two. diff --git a/todo.txt b/todo.txt index a9f311dc1..c96abc23f 100755 --- a/todo.txt +++ b/todo.txt @@ -26,10 +26,11 @@ Bugs - the parser allows empty object case branches - pegs: the anchor '^' does not work because many procs use a linear search and matchLen() -- BUG: generic assign still buggy +- bug: generic assign still buggy - Optimization: If we use a temporary for the result anyway the code gen should make use of this fact to generate better code... - bug: invoking a generic iterator twice triggers a code gen bug +- bug: forward proc for generic seems broken - sorting with leads to a strange memory corruption! --> system.swap or genericAssign is broken! And indeed, if reference counts are not modified and the GC is triggered in between a swap, bad things |