big rename
This commit is contained in:
Araq
parent
df172806ea
commit
27869b6c7b
7 changed files with 380 additions and 380 deletions
|
|
@ -37,7 +37,7 @@ type
|
|||
|
||||
{.deprecated: [TSet: HashSet].}
|
||||
|
||||
proc isValid*[A](s: TSet[A]): bool =
|
||||
proc isValid*[A](s: HashSet[A]): bool =
|
||||
## Returns `true` if the set has been initialized with `initSet <#initSet>`_.
|
||||
##
|
||||
## Most operations over an uninitialized set will crash at runtime and
|
||||
|
|
@ -51,7 +51,7 @@ proc isValid*[A](s: TSet[A]): bool =
|
|||
## # Do stuff here, may crash in release builds!
|
||||
result = not s.data.isNil
|
||||
|
||||
proc len*[A](s: TSet[A]): int =
|
||||
proc len*[A](s: HashSet[A]): int =
|
||||
## Returns the number of keys in `s`.
|
||||
##
|
||||
## Due to an implementation detail you can call this proc on variables which
|
||||
|
|
@ -65,14 +65,14 @@ proc len*[A](s: TSet[A]): int =
|
|||
## assert values.len == 0
|
||||
result = s.counter
|
||||
|
||||
proc card*[A](s: TSet[A]): int =
|
||||
proc card*[A](s: HashSet[A]): int =
|
||||
## Alias for `len() <#len,TSet[A]>`_.
|
||||
##
|
||||
## Card stands for the `cardinality
|
||||
## <http://en.wikipedia.org/wiki/Cardinality>`_ of a set.
|
||||
result = s.counter
|
||||
|
||||
iterator items*[A](s: TSet[A]): A =
|
||||
iterator items*[A](s: HashSet[A]): A =
|
||||
## Iterates over keys in the set `s`.
|
||||
##
|
||||
## If you need a sequence with the keys you can use `sequtils.toSeq()
|
||||
|
|
@ -120,10 +120,10 @@ template rawInsertImpl() {.dirty.} =
|
|||
data[h].key = key
|
||||
data[h].slot = seFilled
|
||||
|
||||
proc rawGet[A](s: TSet[A], key: A): int =
|
||||
proc rawGet[A](s: HashSet[A], key: A): int =
|
||||
rawGetImpl()
|
||||
|
||||
proc mget*[A](s: var TSet[A], key: A): var A =
|
||||
proc mget*[A](s: var HashSet[A], key: A): var A =
|
||||
## returns the element that is actually stored in 's' which has the same
|
||||
## value as 'key' or raises the ``EInvalidKey`` exception. This is useful
|
||||
## when one overloaded 'hash' and '==' but still needs reference semantics
|
||||
|
|
@ -133,7 +133,7 @@ proc mget*[A](s: var TSet[A], key: A): var A =
|
|||
if index >= 0: result = t.data[index].key
|
||||
else: raise newException(KeyError, "key not found: " & $key)
|
||||
|
||||
proc contains*[A](s: TSet[A], key: A): bool =
|
||||
proc contains*[A](s: HashSet[A], key: A): bool =
|
||||
## Returns true iff `key` is in `s`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -149,10 +149,10 @@ proc contains*[A](s: TSet[A], key: A): bool =
|
|||
var index = rawGet(s, key)
|
||||
result = index >= 0
|
||||
|
||||
proc rawInsert[A](s: var TSet[A], data: var KeyValuePairSeq[A], key: A) =
|
||||
proc rawInsert[A](s: var HashSet[A], data: var KeyValuePairSeq[A], key: A) =
|
||||
rawInsertImpl()
|
||||
|
||||
proc enlarge[A](s: var TSet[A]) =
|
||||
proc enlarge[A](s: var HashSet[A]) =
|
||||
var n: KeyValuePairSeq[A]
|
||||
newSeq(n, len(s.data) * growthFactor)
|
||||
for i in countup(0, high(s.data)):
|
||||
|
|
@ -175,7 +175,7 @@ template containsOrInclImpl() {.dirty.} =
|
|||
rawInsert(s, s.data, key)
|
||||
inc(s.counter)
|
||||
|
||||
proc incl*[A](s: var TSet[A], key: A) =
|
||||
proc incl*[A](s: var HashSet[A], key: A) =
|
||||
## Includes an element `key` in `s`.
|
||||
##
|
||||
## This doesn't do anything if `key` is already in `s`. Example:
|
||||
|
|
@ -188,7 +188,7 @@ proc incl*[A](s: var TSet[A], key: A) =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
inclImpl()
|
||||
|
||||
proc incl*[A](s: var TSet[A], other: TSet[A]) =
|
||||
proc incl*[A](s: var HashSet[A], other: TSet[A]) =
|
||||
## Includes all elements from `other` into `s`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -203,7 +203,7 @@ proc incl*[A](s: var TSet[A], other: TSet[A]) =
|
|||
assert other.isValid, "The set `other` needs to be initialized."
|
||||
for item in other: incl(s, item)
|
||||
|
||||
proc excl*[A](s: var TSet[A], key: A) =
|
||||
proc excl*[A](s: var HashSet[A], key: A) =
|
||||
## Excludes `key` from the set `s`.
|
||||
##
|
||||
## This doesn't do anything if `key` is not found in `s`. Example:
|
||||
|
|
@ -219,7 +219,7 @@ proc excl*[A](s: var TSet[A], key: A) =
|
|||
s.data[index].slot = seDeleted
|
||||
dec(s.counter)
|
||||
|
||||
proc excl*[A](s: var TSet[A], other: TSet[A]) =
|
||||
proc excl*[A](s: var HashSet[A], other: TSet[A]) =
|
||||
## Excludes everything in `other` from `s`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -235,7 +235,7 @@ proc excl*[A](s: var TSet[A], other: TSet[A]) =
|
|||
assert other.isValid, "The set `other` needs to be initialized."
|
||||
for item in other: excl(s, item)
|
||||
|
||||
proc containsOrIncl*[A](s: var TSet[A], key: A): bool =
|
||||
proc containsOrIncl*[A](s: var HashSet[A], key: A): bool =
|
||||
## Includes `key` in the set `s` and tells if `key` was added to `s`.
|
||||
##
|
||||
## The difference with regards to the `incl() <#incl,TSet[A],A>`_ proc is
|
||||
|
|
@ -250,7 +250,7 @@ proc containsOrIncl*[A](s: var TSet[A], key: A): bool =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
containsOrInclImpl()
|
||||
|
||||
proc init*[A](s: var TSet[A], initialSize=64) =
|
||||
proc init*[A](s: var HashSet[A], initialSize=64) =
|
||||
## Initializes a hash set.
|
||||
##
|
||||
## The `initialSize` parameter needs to be a power of too. You can use
|
||||
|
|
@ -273,7 +273,7 @@ proc init*[A](s: var TSet[A], initialSize=64) =
|
|||
s.counter = 0
|
||||
newSeq(s.data, initialSize)
|
||||
|
||||
proc initSet*[A](initialSize=64): TSet[A] =
|
||||
proc initSet*[A](initialSize=64): HashSet[A] =
|
||||
## Wrapper around `init() <#init,TSet[A],int>`_ for initialization of hash
|
||||
## sets.
|
||||
##
|
||||
|
|
@ -285,7 +285,7 @@ proc initSet*[A](initialSize=64): TSet[A] =
|
|||
## a.incl(2)
|
||||
result.init(initialSize)
|
||||
|
||||
proc toSet*[A](keys: openArray[A]): TSet[A] =
|
||||
proc toSet*[A](keys: openArray[A]): HashSet[A] =
|
||||
## Creates a new hash set that contains the given `keys`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -304,7 +304,7 @@ template dollarImpl(): stmt {.dirty.} =
|
|||
result.add($key)
|
||||
result.add("}")
|
||||
|
||||
proc `$`*[A](s: TSet[A]): string =
|
||||
proc `$`*[A](s: HashSet[A]): string =
|
||||
## Converts the set `s` to a string, mostly for logging purposes.
|
||||
##
|
||||
## Don't use this proc for serialization, the representation may change at
|
||||
|
|
@ -320,7 +320,7 @@ proc `$`*[A](s: TSet[A]): string =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
dollarImpl()
|
||||
|
||||
proc union*[A](s1, s2: TSet[A]): TSet[A] =
|
||||
proc union*[A](s1, s2: HashSet[A]): TSet[A] =
|
||||
## Returns the union of the sets `s1` and `s2`.
|
||||
##
|
||||
## The union of two sets is represented mathematically as *A ∪ B* and is the
|
||||
|
|
@ -337,7 +337,7 @@ proc union*[A](s1, s2: TSet[A]): TSet[A] =
|
|||
result = s1
|
||||
incl(result, s2)
|
||||
|
||||
proc intersection*[A](s1, s2: TSet[A]): TSet[A] =
|
||||
proc intersection*[A](s1, s2: HashSet[A]): TSet[A] =
|
||||
## Returns the intersection of the sets `s1` and `s2`.
|
||||
##
|
||||
## The intersection of two sets is represented mathematically as *A ∩ B* and
|
||||
|
|
@ -356,7 +356,7 @@ proc intersection*[A](s1, s2: TSet[A]): TSet[A] =
|
|||
for item in s1:
|
||||
if item in s2: incl(result, item)
|
||||
|
||||
proc difference*[A](s1, s2: TSet[A]): TSet[A] =
|
||||
proc difference*[A](s1, s2: HashSet[A]): TSet[A] =
|
||||
## Returns the difference of the sets `s1` and `s2`.
|
||||
##
|
||||
## The difference of two sets is represented mathematically as *A \ B* and is
|
||||
|
|
@ -376,7 +376,7 @@ proc difference*[A](s1, s2: TSet[A]): TSet[A] =
|
|||
if not contains(s2, item):
|
||||
incl(result, item)
|
||||
|
||||
proc symmetricDifference*[A](s1, s2: TSet[A]): TSet[A] =
|
||||
proc symmetricDifference*[A](s1, s2: HashSet[A]): TSet[A] =
|
||||
## Returns the symmetric difference of the sets `s1` and `s2`.
|
||||
##
|
||||
## The symmetric difference of two sets is represented mathematically as *A △
|
||||
|
|
@ -395,23 +395,23 @@ proc symmetricDifference*[A](s1, s2: TSet[A]): TSet[A] =
|
|||
for item in s2:
|
||||
if containsOrIncl(result, item): excl(result, item)
|
||||
|
||||
proc `+`*[A](s1, s2: TSet[A]): TSet[A] {.inline.} =
|
||||
proc `+`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} =
|
||||
## Alias for `union(s1, s2) <#union>`_.
|
||||
result = union(s1, s2)
|
||||
|
||||
proc `*`*[A](s1, s2: TSet[A]): TSet[A] {.inline.} =
|
||||
proc `*`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} =
|
||||
## Alias for `intersection(s1, s2) <#intersection>`_.
|
||||
result = intersection(s1, s2)
|
||||
|
||||
proc `-`*[A](s1, s2: TSet[A]): TSet[A] {.inline.} =
|
||||
proc `-`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} =
|
||||
## Alias for `difference(s1, s2) <#difference>`_.
|
||||
result = difference(s1, s2)
|
||||
|
||||
proc `-+-`*[A](s1, s2: TSet[A]): TSet[A] {.inline.} =
|
||||
proc `-+-`*[A](s1, s2: HashSet[A]): TSet[A] {.inline.} =
|
||||
## Alias for `symmetricDifference(s1, s2) <#symmetricDifference>`_.
|
||||
result = symmetricDifference(s1, s2)
|
||||
|
||||
proc disjoint*[A](s1, s2: TSet[A]): bool =
|
||||
proc disjoint*[A](s1, s2: HashSet[A]): bool =
|
||||
## Returns true iff the sets `s1` and `s2` have no items in common.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -428,7 +428,7 @@ proc disjoint*[A](s1, s2: TSet[A]): bool =
|
|||
if item in s2: return false
|
||||
return true
|
||||
|
||||
proc `<`*[A](s, t: TSet[A]): bool =
|
||||
proc `<`*[A](s, t: HashSet[A]): bool =
|
||||
## Returns true if `s` is a strict or proper subset of `t`.
|
||||
##
|
||||
## A strict or proper subset `s` has all of its members in `t` but `t` has
|
||||
|
|
@ -443,7 +443,7 @@ proc `<`*[A](s, t: TSet[A]): bool =
|
|||
## assert((a < a) == false)
|
||||
s.counter != t.counter and s <= t
|
||||
|
||||
proc `<=`*[A](s, t: TSet[A]): bool =
|
||||
proc `<=`*[A](s, t: HashSet[A]): bool =
|
||||
## Returns true if `s` is subset of `t`.
|
||||
##
|
||||
## A subset `s` has all of its members in `t` and `t` doesn't necessarily
|
||||
|
|
@ -464,7 +464,7 @@ proc `<=`*[A](s, t: TSet[A]): bool =
|
|||
result = false
|
||||
return
|
||||
|
||||
proc `==`*[A](s, t: TSet[A]): bool =
|
||||
proc `==`*[A](s, t: HashSet[A]): bool =
|
||||
## Returns true if both `s` and `t` have the same members and set size.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -477,7 +477,7 @@ proc `==`*[A](s, t: TSet[A]): bool =
|
|||
## assert a == b
|
||||
s.counter == t.counter and s <= t
|
||||
|
||||
proc map*[A, B](data: TSet[A], op: proc (x: A): B {.closure.}): TSet[B] =
|
||||
proc map*[A, B](data: HashSet[A], op: proc (x: A): B {.closure.}): TSet[B] =
|
||||
## Returns a new set after applying `op` on each of the elements of `data`.
|
||||
##
|
||||
## You can use this proc to transform the elements from a set. Example:
|
||||
|
|
@ -534,7 +534,7 @@ proc len*[A](s: OrderedSet[A]): int {.inline.} =
|
|||
## assert values.len == 0
|
||||
result = s.counter
|
||||
|
||||
proc card*[A](s: TOrderedSet[A]): int {.inline.} =
|
||||
proc card*[A](s: OrderedSet[A]): int {.inline.} =
|
||||
## Alias for `len() <#len,TOrderedSet[A]>`_.
|
||||
##
|
||||
## Card stands for the `cardinality
|
||||
|
|
@ -548,7 +548,7 @@ template forAllOrderedPairs(yieldStmt: stmt) {.dirty, immediate.} =
|
|||
if s.data[h].slot == seFilled: yieldStmt
|
||||
h = nxt
|
||||
|
||||
iterator items*[A](s: TOrderedSet[A]): A =
|
||||
iterator items*[A](s: OrderedSet[A]): A =
|
||||
## Iterates over keys in the ordered set `s` in insertion order.
|
||||
##
|
||||
## If you need a sequence with the keys you can use `sequtils.toSeq()
|
||||
|
|
@ -570,10 +570,10 @@ iterator items*[A](s: TOrderedSet[A]): A =
|
|||
forAllOrderedPairs:
|
||||
yield s.data[h].key
|
||||
|
||||
proc rawGet[A](s: TOrderedSet[A], key: A): int =
|
||||
proc rawGet[A](s: OrderedSet[A], key: A): int =
|
||||
rawGetImpl()
|
||||
|
||||
proc contains*[A](s: TOrderedSet[A], key: A): bool =
|
||||
proc contains*[A](s: OrderedSet[A], key: A): bool =
|
||||
## Returns true iff `key` is in `s`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -587,7 +587,7 @@ proc contains*[A](s: TOrderedSet[A], key: A): bool =
|
|||
var index = rawGet(s, key)
|
||||
result = index >= 0
|
||||
|
||||
proc rawInsert[A](s: var TOrderedSet[A],
|
||||
proc rawInsert[A](s: var OrderedSet[A],
|
||||
data: var OrderedKeyValuePairSeq[A], key: A) =
|
||||
rawInsertImpl()
|
||||
data[h].next = -1
|
||||
|
|
@ -595,7 +595,7 @@ proc rawInsert[A](s: var TOrderedSet[A],
|
|||
if s.last >= 0: data[s.last].next = h
|
||||
s.last = h
|
||||
|
||||
proc enlarge[A](s: var TOrderedSet[A]) =
|
||||
proc enlarge[A](s: var OrderedSet[A]) =
|
||||
var n: OrderedKeyValuePairSeq[A]
|
||||
newSeq(n, len(s.data) * growthFactor)
|
||||
var h = s.first
|
||||
|
|
@ -608,7 +608,7 @@ proc enlarge[A](s: var TOrderedSet[A]) =
|
|||
h = nxt
|
||||
swap(s.data, n)
|
||||
|
||||
proc incl*[A](s: var TOrderedSet[A], key: A) =
|
||||
proc incl*[A](s: var OrderedSet[A], key: A) =
|
||||
## Includes an element `key` in `s`.
|
||||
##
|
||||
## This doesn't do anything if `key` is already in `s`. Example:
|
||||
|
|
@ -621,7 +621,7 @@ proc incl*[A](s: var TOrderedSet[A], key: A) =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
inclImpl()
|
||||
|
||||
proc incl*[A](s: var TSet[A], other: TOrderedSet[A]) =
|
||||
proc incl*[A](s: var HashSet[A], other: TOrderedSet[A]) =
|
||||
## Includes all elements from `other` into `s`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -636,7 +636,7 @@ proc incl*[A](s: var TSet[A], other: TOrderedSet[A]) =
|
|||
assert other.isValid, "The set `other` needs to be initialized."
|
||||
for item in other: incl(s, item)
|
||||
|
||||
proc containsOrIncl*[A](s: var TOrderedSet[A], key: A): bool =
|
||||
proc containsOrIncl*[A](s: var OrderedSet[A], key: A): bool =
|
||||
## Includes `key` in the set `s` and tells if `key` was added to `s`.
|
||||
##
|
||||
## The difference with regards to the `incl() <#incl,TOrderedSet[A],A>`_ proc
|
||||
|
|
@ -651,7 +651,7 @@ proc containsOrIncl*[A](s: var TOrderedSet[A], key: A): bool =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
containsOrInclImpl()
|
||||
|
||||
proc init*[A](s: var TOrderedSet[A], initialSize=64) =
|
||||
proc init*[A](s: var OrderedSet[A], initialSize=64) =
|
||||
## Initializes an ordered hash set.
|
||||
##
|
||||
## The `initialSize` parameter needs to be a power of too. You can use
|
||||
|
|
@ -676,7 +676,7 @@ proc init*[A](s: var TOrderedSet[A], initialSize=64) =
|
|||
s.last = -1
|
||||
newSeq(s.data, initialSize)
|
||||
|
||||
proc initOrderedSet*[A](initialSize=64): TOrderedSet[A] =
|
||||
proc initOrderedSet*[A](initialSize=64): OrderedSet[A] =
|
||||
## Wrapper around `init() <#init,TOrderedSet[A],int>`_ for initialization of
|
||||
## ordered hash sets.
|
||||
##
|
||||
|
|
@ -688,7 +688,7 @@ proc initOrderedSet*[A](initialSize=64): TOrderedSet[A] =
|
|||
## a.incl(2)
|
||||
result.init(initialSize)
|
||||
|
||||
proc toOrderedSet*[A](keys: openArray[A]): TOrderedSet[A] =
|
||||
proc toOrderedSet*[A](keys: openArray[A]): OrderedSet[A] =
|
||||
## Creates a new ordered hash set that contains the given `keys`.
|
||||
##
|
||||
## Example:
|
||||
|
|
@ -700,7 +700,7 @@ proc toOrderedSet*[A](keys: openArray[A]): TOrderedSet[A] =
|
|||
result = initOrderedSet[A](nextPowerOfTwo(keys.len+10))
|
||||
for key in items(keys): result.incl(key)
|
||||
|
||||
proc `$`*[A](s: TOrderedSet[A]): string =
|
||||
proc `$`*[A](s: OrderedSet[A]): string =
|
||||
## Converts the ordered hash set `s` to a string, mostly for logging purposes.
|
||||
##
|
||||
## Don't use this proc for serialization, the representation may change at
|
||||
|
|
@ -716,7 +716,7 @@ proc `$`*[A](s: TOrderedSet[A]): string =
|
|||
assert s.isValid, "The set needs to be initialized."
|
||||
dollarImpl()
|
||||
|
||||
proc `==`*[A](s, t: TOrderedSet[A]): bool =
|
||||
proc `==`*[A](s, t: OrderedSet[A]): bool =
|
||||
## Equality for ordered sets.
|
||||
if s.counter != t.counter: return false
|
||||
var h = s.first
|
||||
|
|
@ -738,7 +738,7 @@ proc testModule() =
|
|||
## Internal micro test to validate docstrings and such.
|
||||
block isValidTest:
|
||||
var options: HashSet[string]
|
||||
proc savePreferences(options: TSet[string]) =
|
||||
proc savePreferences(options: HashSet[string]) =
|
||||
assert options.isValid, "Pass an initialized set!"
|
||||
options = initSet[string]()
|
||||
options.savePreferences
|
||||
|
|
@ -839,7 +839,7 @@ proc testModule() =
|
|||
|
||||
block isValidTest:
|
||||
var cards: OrderedSet[string]
|
||||
proc saveTarotCards(cards: TOrderedSet[string]) =
|
||||
proc saveTarotCards(cards: OrderedSet[string]) =
|
||||
assert cards.isValid, "Pass an initialized set!"
|
||||
cards = initOrderedSet[string]()
|
||||
cards.saveTarotCards
|
||||
|
|
@ -891,7 +891,7 @@ proc testModule() =
|
|||
a.incl(2)
|
||||
assert a.len == 1
|
||||
|
||||
var b: TSet[int]
|
||||
var b: HashSet[int]
|
||||
b.init(4)
|
||||
b.incl(2)
|
||||
b.init
|
||||
|
|
|
|||
|
|
@ -74,32 +74,32 @@ type
|
|||
when not defined(nimhygiene):
|
||||
{.pragma: dirty.}
|
||||
|
||||
proc len*[A, B](t: TTable[A, B]): int =
|
||||
proc len*[A, B](t: Table[A, B]): int =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
iterator pairs*[A, B](t: TTable[A, B]): tuple[key: A, val: B] =
|
||||
iterator pairs*[A, B](t: Table[A, B]): tuple[key: A, val: B] =
|
||||
## iterates over any (key, value) pair in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A, B](t: var TTable[A, B]): tuple[key: A, val: var B] =
|
||||
iterator mpairs*[A, B](t: var Table[A, B]): tuple[key: A, val: var B] =
|
||||
## iterates over any (key, value) pair in the table `t`. The values
|
||||
## can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A, B](t: TTable[A, B]): A =
|
||||
iterator keys*[A, B](t: Table[A, B]): A =
|
||||
## iterates over any key in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].key
|
||||
|
||||
iterator values*[A, B](t: TTable[A, B]): B =
|
||||
iterator values*[A, B](t: Table[A, B]): B =
|
||||
## iterates over any value in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A, B](t: var TTable[A, B]): var B =
|
||||
iterator mvalues*[A, B](t: var Table[A, B]): var B =
|
||||
## iterates over any value in the table `t`. The values can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].val
|
||||
|
|
@ -130,10 +130,10 @@ template rawInsertImpl() {.dirty.} =
|
|||
data[h].val = val
|
||||
data[h].slot = seFilled
|
||||
|
||||
proc rawGet[A, B](t: TTable[A, B], key: A): int =
|
||||
proc rawGet[A, B](t: Table[A, B], key: A): int =
|
||||
rawGetImpl()
|
||||
|
||||
proc `[]`*[A, B](t: TTable[A, B], key: A): B =
|
||||
proc `[]`*[A, B](t: Table[A, B], key: A): B =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## default empty value for the type `B` is returned
|
||||
## and no exception is raised. One can check with ``hasKey`` whether the key
|
||||
|
|
@ -141,14 +141,14 @@ proc `[]`*[A, B](t: TTable[A, B], key: A): B =
|
|||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
|
||||
proc mget*[A, B](t: var TTable[A, B], key: A): var B =
|
||||
proc mget*[A, B](t: var Table[A, B], key: A): var B =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
else: raise newException(KeyError, "key not found: " & $key)
|
||||
|
||||
iterator allValues*[A, B](t: TTable[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`.
|
||||
var h: THash = hash(key) and high(t.data)
|
||||
while t.data[h].slot != seEmpty:
|
||||
|
|
@ -156,15 +156,15 @@ iterator allValues*[A, B](t: TTable[A, B]; key: A): B =
|
|||
yield t.data[h].val
|
||||
h = nextTry(h, high(t.data))
|
||||
|
||||
proc hasKey*[A, B](t: TTable[A, B], key: A): bool =
|
||||
proc hasKey*[A, B](t: Table[A, B], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = rawGet(t, key) >= 0
|
||||
|
||||
proc rawInsert[A, B](t: var TTable[A, B], data: var KeyValuePairSeq[A, B],
|
||||
proc rawInsert[A, B](t: var Table[A, B], data: var KeyValuePairSeq[A, B],
|
||||
key: A, val: B) =
|
||||
rawInsertImpl()
|
||||
|
||||
proc enlarge[A, B](t: var TTable[A, B]) =
|
||||
proc enlarge[A, B](t: var Table[A, B]) =
|
||||
var n: KeyValuePairSeq[A, B]
|
||||
newSeq(n, len(t.data) * growthFactor)
|
||||
for i in countup(0, high(t.data)):
|
||||
|
|
@ -196,22 +196,22 @@ when false:
|
|||
inc(t.counter)
|
||||
result = false
|
||||
|
||||
proc `[]=`*[A, B](t: var TTable[A, B], key: A, val: B) =
|
||||
proc `[]=`*[A, B](t: var Table[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) =
|
||||
proc add*[A, B](t: var Table[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) =
|
||||
proc del*[A, B](t: var Table[A, B], key: A) =
|
||||
## deletes `key` from hash table `t`.
|
||||
let index = rawGet(t, key)
|
||||
if index >= 0:
|
||||
t.data[index].slot = seDeleted
|
||||
dec(t.counter)
|
||||
|
||||
proc initTable*[A, B](initialSize=64): TTable[A, B] =
|
||||
proc initTable*[A, B](initialSize=64): Table[A, B] =
|
||||
## creates a new hash table that is empty.
|
||||
##
|
||||
## `initialSize` needs to be a power of two. If you need to accept runtime
|
||||
|
|
@ -222,7 +222,7 @@ proc initTable*[A, B](initialSize=64): TTable[A, B] =
|
|||
newSeq(result.data, initialSize)
|
||||
|
||||
proc toTable*[A, B](pairs: openArray[tuple[key: A,
|
||||
val: B]]): TTable[A, B] =
|
||||
val: B]]): Table[A, B] =
|
||||
## creates a new hash table that contains the given `pairs`.
|
||||
result = initTable[A, B](nextPowerOfTwo(pairs.len+10))
|
||||
for key, val in items(pairs): result[key] = val
|
||||
|
|
@ -239,7 +239,7 @@ template dollarImpl(): stmt {.dirty.} =
|
|||
result.add($val)
|
||||
result.add("}")
|
||||
|
||||
proc `$`*[A, B](t: TTable[A, B]): string =
|
||||
proc `$`*[A, B](t: Table[A, B]): string =
|
||||
## The `$` operator for hash tables.
|
||||
dollarImpl()
|
||||
|
||||
|
|
@ -253,93 +253,93 @@ template equalsImpl() =
|
|||
if t[key] != val: return false
|
||||
return true
|
||||
|
||||
proc `==`*[A, B](s, t: TTable[A, B]): bool =
|
||||
proc `==`*[A, B](s, t: Table[A, B]): bool =
|
||||
equalsImpl()
|
||||
|
||||
proc indexBy*[A, B, C](collection: A, index: proc(x: B): C): TTable[C, B] =
|
||||
proc indexBy*[A, B, C](collection: A, index: proc(x: B): C): Table[C, B] =
|
||||
## Index the collection with the proc provided.
|
||||
# TODO: As soon as supported, change collection: A to collection: A[B]
|
||||
result = initTable[C, B]()
|
||||
for item in collection:
|
||||
result[index(item)] = item
|
||||
|
||||
proc len*[A, B](t: PTable[A, B]): int =
|
||||
proc len*[A, B](t: TableRef[A, B]): int =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
iterator pairs*[A, B](t: PTable[A, B]): tuple[key: A, val: B] =
|
||||
iterator pairs*[A, B](t: TableRef[A, B]): tuple[key: A, val: B] =
|
||||
## iterates over any (key, value) pair in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A, B](t: PTable[A, B]): tuple[key: A, val: var B] =
|
||||
iterator mpairs*[A, B](t: TableRef[A, B]): tuple[key: A, val: var B] =
|
||||
## iterates over any (key, value) pair in the table `t`. The values
|
||||
## can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A, B](t: PTable[A, B]): A =
|
||||
iterator keys*[A, B](t: TableRef[A, B]): A =
|
||||
## iterates over any key in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].key
|
||||
|
||||
iterator values*[A, B](t: PTable[A, B]): B =
|
||||
iterator values*[A, B](t: TableRef[A, B]): B =
|
||||
## iterates over any value in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A, B](t: PTable[A, B]): var B =
|
||||
iterator mvalues*[A, B](t: TableRef[A, B]): var B =
|
||||
## iterates over any value in the table `t`. The values can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].slot == seFilled: yield t.data[h].val
|
||||
|
||||
proc `[]`*[A, B](t: PTable[A, B], key: A): B =
|
||||
proc `[]`*[A, B](t: TableRef[A, B], key: A): B =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## default empty value for the type `B` is returned
|
||||
## and no exception is raised. One can check with ``hasKey`` whether the key
|
||||
## exists.
|
||||
result = t[][key]
|
||||
|
||||
proc mget*[A, B](t: PTable[A, B], key: A): var B =
|
||||
proc mget*[A, B](t: TableRef[A, B], key: A): var B =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
t[].mget(key)
|
||||
|
||||
proc hasKey*[A, B](t: PTable[A, B], key: A): bool =
|
||||
proc hasKey*[A, B](t: TableRef[A, B], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = t[].hasKey(key)
|
||||
|
||||
proc `[]=`*[A, B](t: PTable[A, B], key: A, val: B) =
|
||||
proc `[]=`*[A, B](t: TableRef[A, B], key: A, val: B) =
|
||||
## puts a (key, value)-pair into `t`.
|
||||
t[][key] = val
|
||||
|
||||
proc add*[A, B](t: PTable[A, B], key: A, val: B) =
|
||||
proc add*[A, B](t: TableRef[A, B], key: A, val: B) =
|
||||
## puts a new (key, value)-pair into `t` even if ``t[key]`` already exists.
|
||||
t[].add(key, val)
|
||||
|
||||
proc del*[A, B](t: PTable[A, B], key: A) =
|
||||
proc del*[A, B](t: TableRef[A, B], key: A) =
|
||||
## deletes `key` from hash table `t`.
|
||||
t[].del(key)
|
||||
|
||||
proc newTable*[A, B](initialSize=64): PTable[A, B] =
|
||||
proc newTable*[A, B](initialSize=64): TableRef[A, B] =
|
||||
new(result)
|
||||
result[] = initTable[A, B](initialSize)
|
||||
|
||||
proc newTable*[A, B](pairs: openArray[tuple[key: A, val: B]]): PTable[A, B] =
|
||||
proc newTable*[A, B](pairs: openArray[tuple[key: A, val: B]]): TableRef[A, B] =
|
||||
## creates a new hash table that contains the given `pairs`.
|
||||
new(result)
|
||||
result[] = toTable[A, B](pairs)
|
||||
|
||||
proc `$`*[A, B](t: PTable[A, B]): string =
|
||||
proc `$`*[A, B](t: TableRef[A, B]): string =
|
||||
## The `$` operator for hash tables.
|
||||
dollarImpl()
|
||||
|
||||
proc `==`*[A, B](s, t: PTable[A, B]): bool =
|
||||
proc `==`*[A, B](s, t: TableRef[A, B]): bool =
|
||||
if isNil(s): result = isNil(t)
|
||||
elif isNil(t): result = false
|
||||
else: result = equalsImpl()
|
||||
|
||||
proc newTableFrom*[A, B, C](collection: A, index: proc(x: B): C): PTable[C, B] =
|
||||
proc newTableFrom*[A, B, C](collection: A, index: proc(x: B): C): TableRef[C, B] =
|
||||
## Index the collection with the proc provided.
|
||||
# TODO: As soon as supported, change collection: A to collection: A[B]
|
||||
result = newTable[C, B]()
|
||||
|
|
@ -360,7 +360,7 @@ type
|
|||
|
||||
{.deprecated: [TOrderedTable: OrderedTable, POrderedTable: OrderedTableRef].}
|
||||
|
||||
proc len*[A, B](t: TOrderedTable[A, B]): int {.inline.} =
|
||||
proc len*[A, B](t: OrderedTable[A, B]): int {.inline.} =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
|
|
@ -371,38 +371,38 @@ template forAllOrderedPairs(yieldStmt: stmt) {.dirty, immediate.} =
|
|||
if t.data[h].slot == seFilled: yieldStmt
|
||||
h = nxt
|
||||
|
||||
iterator pairs*[A, B](t: TOrderedTable[A, B]): tuple[key: A, val: B] =
|
||||
iterator pairs*[A, B](t: OrderedTable[A, B]): tuple[key: A, val: B] =
|
||||
## iterates over any (key, value) pair in the table `t` in insertion
|
||||
## order.
|
||||
forAllOrderedPairs:
|
||||
yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A, B](t: var TOrderedTable[A, B]): tuple[key: A, val: var B] =
|
||||
iterator mpairs*[A, B](t: var OrderedTable[A, B]): tuple[key: A, val: var B] =
|
||||
## iterates over any (key, value) pair in the table `t` in insertion
|
||||
## order. The values can be modified.
|
||||
forAllOrderedPairs:
|
||||
yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A, B](t: TOrderedTable[A, B]): A =
|
||||
iterator keys*[A, B](t: OrderedTable[A, B]): A =
|
||||
## iterates over any key in the table `t` in insertion order.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].key
|
||||
|
||||
iterator values*[A, B](t: TOrderedTable[A, B]): B =
|
||||
iterator values*[A, B](t: OrderedTable[A, B]): B =
|
||||
## iterates over any value in the table `t` in insertion order.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A, B](t: var TOrderedTable[A, B]): var B =
|
||||
iterator mvalues*[A, B](t: var OrderedTable[A, B]): var B =
|
||||
## iterates over any value in the table `t` in insertion order. The values
|
||||
## can be modified.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].val
|
||||
|
||||
proc rawGet[A, B](t: TOrderedTable[A, B], key: A): int =
|
||||
proc rawGet[A, B](t: OrderedTable[A, B], key: A): int =
|
||||
rawGetImpl()
|
||||
|
||||
proc `[]`*[A, B](t: TOrderedTable[A, B], key: A): B =
|
||||
proc `[]`*[A, B](t: OrderedTable[A, B], key: A): B =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## default empty value for the type `B` is returned
|
||||
## and no exception is raised. One can check with ``hasKey`` whether the key
|
||||
|
|
@ -410,18 +410,18 @@ proc `[]`*[A, B](t: TOrderedTable[A, B], key: A): B =
|
|||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
|
||||
proc mget*[A, B](t: var TOrderedTable[A, B], key: A): var B =
|
||||
proc mget*[A, B](t: var OrderedTable[A, B], key: A): var B =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
else: raise newException(KeyError, "key not found: " & $key)
|
||||
|
||||
proc hasKey*[A, B](t: TOrderedTable[A, B], key: A): bool =
|
||||
proc hasKey*[A, B](t: OrderedTable[A, B], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = rawGet(t, key) >= 0
|
||||
|
||||
proc rawInsert[A, B](t: var TOrderedTable[A, B],
|
||||
proc rawInsert[A, B](t: var OrderedTable[A, B],
|
||||
data: var OrderedKeyValuePairSeq[A, B],
|
||||
key: A, val: B) =
|
||||
rawInsertImpl()
|
||||
|
|
@ -430,7 +430,7 @@ proc rawInsert[A, B](t: var TOrderedTable[A, B],
|
|||
if t.last >= 0: data[t.last].next = h
|
||||
t.last = h
|
||||
|
||||
proc enlarge[A, B](t: var TOrderedTable[A, B]) =
|
||||
proc enlarge[A, B](t: var OrderedTable[A, B]) =
|
||||
var n: OrderedKeyValuePairSeq[A, B]
|
||||
newSeq(n, len(t.data) * growthFactor)
|
||||
var h = t.first
|
||||
|
|
@ -443,15 +443,15 @@ proc enlarge[A, B](t: var TOrderedTable[A, B]) =
|
|||
h = nxt
|
||||
swap(t.data, n)
|
||||
|
||||
proc `[]=`*[A, B](t: var TOrderedTable[A, B], key: A, val: B) =
|
||||
proc `[]=`*[A, B](t: var OrderedTable[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) =
|
||||
proc add*[A, B](t: var OrderedTable[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] =
|
||||
proc initOrderedTable*[A, B](initialSize=64): OrderedTable[A, B] =
|
||||
## creates a new ordered hash table that is empty.
|
||||
##
|
||||
## `initialSize` needs to be a power of two. If you need to accept runtime
|
||||
|
|
@ -464,16 +464,16 @@ proc initOrderedTable*[A, B](initialSize=64): TOrderedTable[A, B] =
|
|||
newSeq(result.data, initialSize)
|
||||
|
||||
proc toOrderedTable*[A, B](pairs: openArray[tuple[key: A,
|
||||
val: B]]): TOrderedTable[A, B] =
|
||||
val: B]]): OrderedTable[A, B] =
|
||||
## creates a new ordered hash table that contains the given `pairs`.
|
||||
result = initOrderedTable[A, B](nextPowerOfTwo(pairs.len+10))
|
||||
for key, val in items(pairs): result[key] = val
|
||||
|
||||
proc `$`*[A, B](t: TOrderedTable[A, B]): string =
|
||||
proc `$`*[A, B](t: OrderedTable[A, B]): string =
|
||||
## The `$` operator for ordered hash tables.
|
||||
dollarImpl()
|
||||
|
||||
proc sort*[A, B](t: var TOrderedTable[A, B],
|
||||
proc sort*[A, B](t: var OrderedTable[A, B],
|
||||
cmp: proc (x,y: tuple[key: A, val: B]): int) =
|
||||
## sorts `t` according to `cmp`. This modifies the internal list
|
||||
## that kept the insertion order, so insertion order is lost after this
|
||||
|
|
@ -519,7 +519,7 @@ proc sort*[A, B](t: var TOrderedTable[A, B],
|
|||
t.first = list
|
||||
t.last = tail
|
||||
|
||||
proc len*[A, B](t: POrderedTable[A, B]): int {.inline.} =
|
||||
proc len*[A, B](t: OrderedTableRef[A, B]): int {.inline.} =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
|
|
@ -530,59 +530,59 @@ template forAllOrderedPairs(yieldStmt: stmt) {.dirty, immediate.} =
|
|||
if t.data[h].slot == seFilled: yieldStmt
|
||||
h = nxt
|
||||
|
||||
iterator pairs*[A, B](t: POrderedTable[A, B]): tuple[key: A, val: B] =
|
||||
iterator pairs*[A, B](t: OrderedTableRef[A, B]): tuple[key: A, val: B] =
|
||||
## iterates over any (key, value) pair in the table `t` in insertion
|
||||
## order.
|
||||
forAllOrderedPairs:
|
||||
yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A, B](t: POrderedTable[A, B]): tuple[key: A, val: var B] =
|
||||
iterator mpairs*[A, B](t: OrderedTableRef[A, B]): tuple[key: A, val: var B] =
|
||||
## iterates over any (key, value) pair in the table `t` in insertion
|
||||
## order. The values can be modified.
|
||||
forAllOrderedPairs:
|
||||
yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A, B](t: POrderedTable[A, B]): A =
|
||||
iterator keys*[A, B](t: OrderedTableRef[A, B]): A =
|
||||
## iterates over any key in the table `t` in insertion order.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].key
|
||||
|
||||
iterator values*[A, B](t: POrderedTable[A, B]): B =
|
||||
iterator values*[A, B](t: OrderedTableRef[A, B]): B =
|
||||
## iterates over any value in the table `t` in insertion order.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A, B](t: POrderedTable[A, B]): var B =
|
||||
iterator mvalues*[A, B](t: OrderedTableRef[A, B]): var B =
|
||||
## iterates over any value in the table `t` in insertion order. The values
|
||||
## can be modified.
|
||||
forAllOrderedPairs:
|
||||
yield t.data[h].val
|
||||
|
||||
proc `[]`*[A, B](t: POrderedTable[A, B], key: A): B =
|
||||
proc `[]`*[A, B](t: OrderedTableRef[A, B], key: A): B =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## default empty value for the type `B` is returned
|
||||
## and no exception is raised. One can check with ``hasKey`` whether the key
|
||||
## exists.
|
||||
result = t[][key]
|
||||
|
||||
proc mget*[A, B](t: POrderedTable[A, B], key: A): var B =
|
||||
proc mget*[A, B](t: OrderedTableRef[A, B], key: A): var B =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
result = t[].mget(key)
|
||||
|
||||
proc hasKey*[A, B](t: POrderedTable[A, B], key: A): bool =
|
||||
proc hasKey*[A, B](t: OrderedTableRef[A, B], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = t[].hasKey(key)
|
||||
|
||||
proc `[]=`*[A, B](t: POrderedTable[A, B], key: A, val: B) =
|
||||
proc `[]=`*[A, B](t: OrderedTableRef[A, B], key: A, val: B) =
|
||||
## puts a (key, value)-pair into `t`.
|
||||
t[][key] = val
|
||||
|
||||
proc add*[A, B](t: POrderedTable[A, B], key: A, val: B) =
|
||||
proc add*[A, B](t: OrderedTableRef[A, B], key: A, val: B) =
|
||||
## puts a new (key, value)-pair into `t` even if ``t[key]`` already exists.
|
||||
t[].add(key, val)
|
||||
|
||||
proc newOrderedTable*[A, B](initialSize=64): POrderedTable[A, B] =
|
||||
proc newOrderedTable*[A, B](initialSize=64): OrderedTableRef[A, B] =
|
||||
## creates a new ordered hash table that is empty.
|
||||
##
|
||||
## `initialSize` needs to be a power of two. If you need to accept runtime
|
||||
|
|
@ -592,16 +592,16 @@ proc newOrderedTable*[A, B](initialSize=64): POrderedTable[A, B] =
|
|||
result[] = initOrderedTable[A, B]()
|
||||
|
||||
proc newOrderedTable*[A, B](pairs: openArray[tuple[key: A,
|
||||
val: B]]): POrderedTable[A, B] =
|
||||
val: B]]): OrderedTableRef[A, B] =
|
||||
## creates a new ordered hash table that contains the given `pairs`.
|
||||
result = newOrderedTable[A, B](nextPowerOfTwo(pairs.len+10))
|
||||
for key, val in items(pairs): result[key] = val
|
||||
|
||||
proc `$`*[A, B](t: POrderedTable[A, B]): string =
|
||||
proc `$`*[A, B](t: OrderedTableRef[A, B]): string =
|
||||
## The `$` operator for ordered hash tables.
|
||||
dollarImpl()
|
||||
|
||||
proc sort*[A, B](t: POrderedTable[A, B],
|
||||
proc sort*[A, B](t: OrderedTableRef[A, B],
|
||||
cmp: proc (x,y: tuple[key: A, val: B]): int) =
|
||||
## sorts `t` according to `cmp`. This modifies the internal list
|
||||
## that kept the insertion order, so insertion order is lost after this
|
||||
|
|
@ -620,81 +620,81 @@ type
|
|||
|
||||
{.deprecated: [TCountTable: CountTable, PCountTable: CountTableRef].}
|
||||
|
||||
proc len*[A](t: TCountTable[A]): int =
|
||||
proc len*[A](t: CountTable[A]): int =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
iterator pairs*[A](t: TCountTable[A]): tuple[key: A, val: int] =
|
||||
iterator pairs*[A](t: CountTable[A]): tuple[key: A, val: int] =
|
||||
## iterates over any (key, value) pair in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A](t: var TCountTable[A]): tuple[key: A, val: var int] =
|
||||
iterator mpairs*[A](t: var CountTable[A]): tuple[key: A, val: var int] =
|
||||
## iterates over any (key, value) pair in the table `t`. The values can
|
||||
## be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A](t: TCountTable[A]): A =
|
||||
iterator keys*[A](t: CountTable[A]): A =
|
||||
## iterates over any key in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].key
|
||||
|
||||
iterator values*[A](t: TCountTable[A]): int =
|
||||
iterator values*[A](t: CountTable[A]): int =
|
||||
## iterates over any value in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A](t: TCountTable[A]): var int =
|
||||
iterator mvalues*[A](t: CountTable[A]): var int =
|
||||
## iterates over any value in the table `t`. The values can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].val
|
||||
|
||||
proc rawGet[A](t: TCountTable[A], key: A): int =
|
||||
proc rawGet[A](t: CountTable[A], key: A): int =
|
||||
var h: THash = hash(key) and high(t.data) # start with real hash value
|
||||
while t.data[h].val != 0:
|
||||
if t.data[h].key == key: return h
|
||||
h = nextTry(h, high(t.data))
|
||||
result = -1
|
||||
|
||||
proc `[]`*[A](t: TCountTable[A], key: A): int =
|
||||
proc `[]`*[A](t: CountTable[A], key: A): int =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## 0 is returned. One can check with ``hasKey`` whether the key
|
||||
## exists.
|
||||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
|
||||
proc mget*[A](t: var TCountTable[A], key: A): var int =
|
||||
proc mget*[A](t: var CountTable[A], key: A): var int =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
var index = rawGet(t, key)
|
||||
if index >= 0: result = t.data[index].val
|
||||
else: raise newException(KeyError, "key not found: " & $key)
|
||||
|
||||
proc hasKey*[A](t: TCountTable[A], key: A): bool =
|
||||
proc hasKey*[A](t: CountTable[A], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = rawGet(t, key) >= 0
|
||||
|
||||
proc rawInsert[A](t: TCountTable[A], data: var seq[tuple[key: A, val: int]],
|
||||
proc rawInsert[A](t: CountTable[A], data: var seq[tuple[key: A, val: int]],
|
||||
key: A, val: int) =
|
||||
var h: THash = hash(key) and high(data)
|
||||
while data[h].val != 0: h = nextTry(h, high(data))
|
||||
data[h].key = key
|
||||
data[h].val = val
|
||||
|
||||
proc enlarge[A](t: var TCountTable[A]) =
|
||||
proc enlarge[A](t: var CountTable[A]) =
|
||||
var n: seq[tuple[key: A, val: int]]
|
||||
newSeq(n, len(t.data) * growthFactor)
|
||||
for i in countup(0, high(t.data)):
|
||||
if t.data[i].val != 0: rawInsert(t, n, t.data[i].key, t.data[i].val)
|
||||
swap(t.data, n)
|
||||
|
||||
proc `[]=`*[A](t: var TCountTable[A], key: A, val: int) =
|
||||
proc `[]=`*[A](t: var CountTable[A], key: A, val: int) =
|
||||
## puts a (key, value)-pair into `t`. `val` has to be positive.
|
||||
assert val > 0
|
||||
putImpl()
|
||||
|
||||
proc initCountTable*[A](initialSize=64): TCountTable[A] =
|
||||
proc initCountTable*[A](initialSize=64): CountTable[A] =
|
||||
## creates a new count table that is empty.
|
||||
##
|
||||
## `initialSize` needs to be a power of two. If you need to accept runtime
|
||||
|
|
@ -704,16 +704,16 @@ proc initCountTable*[A](initialSize=64): TCountTable[A] =
|
|||
result.counter = 0
|
||||
newSeq(result.data, initialSize)
|
||||
|
||||
proc toCountTable*[A](keys: openArray[A]): TCountTable[A] =
|
||||
proc toCountTable*[A](keys: openArray[A]): CountTable[A] =
|
||||
## creates a new count table with every key in `keys` having a count of 1.
|
||||
result = initCountTable[A](nextPowerOfTwo(keys.len+10))
|
||||
for key in items(keys): result[key] = 1
|
||||
|
||||
proc `$`*[A](t: TCountTable[A]): string =
|
||||
proc `$`*[A](t: CountTable[A]): string =
|
||||
## The `$` operator for count tables.
|
||||
dollarImpl()
|
||||
|
||||
proc inc*[A](t: var TCountTable[A], key: A, val = 1) =
|
||||
proc inc*[A](t: var CountTable[A], key: A, val = 1) =
|
||||
## increments `t[key]` by `val`.
|
||||
var index = rawGet(t, key)
|
||||
if index >= 0:
|
||||
|
|
@ -723,7 +723,7 @@ proc inc*[A](t: var TCountTable[A], key: A, val = 1) =
|
|||
rawInsert(t, t.data, key, val)
|
||||
inc(t.counter)
|
||||
|
||||
proc smallest*[A](t: TCountTable[A]): tuple[key: A, val: int] =
|
||||
proc smallest*[A](t: CountTable[A]): tuple[key: A, val: int] =
|
||||
## returns the largest (key,val)-pair. Efficiency: O(n)
|
||||
assert t.len > 0
|
||||
var minIdx = 0
|
||||
|
|
@ -732,7 +732,7 @@ proc smallest*[A](t: TCountTable[A]): tuple[key: A, val: int] =
|
|||
result.key = t.data[minIdx].key
|
||||
result.val = t.data[minIdx].val
|
||||
|
||||
proc largest*[A](t: TCountTable[A]): tuple[key: A, val: int] =
|
||||
proc largest*[A](t: CountTable[A]): tuple[key: A, val: int] =
|
||||
## returns the (key,val)-pair with the largest `val`. Efficiency: O(n)
|
||||
assert t.len > 0
|
||||
var maxIdx = 0
|
||||
|
|
@ -741,7 +741,7 @@ proc largest*[A](t: TCountTable[A]): tuple[key: A, val: int] =
|
|||
result.key = t.data[maxIdx].key
|
||||
result.val = t.data[maxIdx].val
|
||||
|
||||
proc sort*[A](t: var TCountTable[A]) =
|
||||
proc sort*[A](t: var CountTable[A]) =
|
||||
## sorts the count table so that the entry with the highest counter comes
|
||||
## first. This is destructive! You must not modify `t` afterwards!
|
||||
## You can use the iterators `pairs`, `keys`, and `values` to iterate over
|
||||
|
|
@ -762,57 +762,57 @@ proc sort*[A](t: var TCountTable[A]) =
|
|||
if j < h: break
|
||||
if h == 1: break
|
||||
|
||||
proc len*[A](t: PCountTable[A]): int =
|
||||
proc len*[A](t: CountTableRef[A]): int =
|
||||
## returns the number of keys in `t`.
|
||||
result = t.counter
|
||||
|
||||
iterator pairs*[A](t: PCountTable[A]): tuple[key: A, val: int] =
|
||||
iterator pairs*[A](t: CountTableRef[A]): tuple[key: A, val: int] =
|
||||
## iterates over any (key, value) pair in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator mpairs*[A](t: PCountTable[A]): tuple[key: A, val: var int] =
|
||||
iterator mpairs*[A](t: CountTableRef[A]): tuple[key: A, val: var int] =
|
||||
## iterates over any (key, value) pair in the table `t`. The values can
|
||||
## be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield (t.data[h].key, t.data[h].val)
|
||||
|
||||
iterator keys*[A](t: PCountTable[A]): A =
|
||||
iterator keys*[A](t: CountTableRef[A]): A =
|
||||
## iterates over any key in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].key
|
||||
|
||||
iterator values*[A](t: PCountTable[A]): int =
|
||||
iterator values*[A](t: CountTableRef[A]): int =
|
||||
## iterates over any value in the table `t`.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].val
|
||||
|
||||
iterator mvalues*[A](t: PCountTable[A]): var int =
|
||||
iterator mvalues*[A](t: CountTableRef[A]): var int =
|
||||
## iterates over any value in the table `t`. The values can be modified.
|
||||
for h in 0..high(t.data):
|
||||
if t.data[h].val != 0: yield t.data[h].val
|
||||
|
||||
proc `[]`*[A](t: PCountTable[A], key: A): int =
|
||||
proc `[]`*[A](t: CountTableRef[A], key: A): int =
|
||||
## retrieves the value at ``t[key]``. If `key` is not in `t`,
|
||||
## 0 is returned. One can check with ``hasKey`` whether the key
|
||||
## exists.
|
||||
result = t[][key]
|
||||
|
||||
proc mget*[A](t: PCountTable[A], key: A): var int =
|
||||
proc mget*[A](t: CountTableRef[A], key: A): var int =
|
||||
## retrieves the value at ``t[key]``. The value can be modified.
|
||||
## If `key` is not in `t`, the ``EInvalidKey`` exception is raised.
|
||||
result = t[].mget(key)
|
||||
|
||||
proc hasKey*[A](t: PCountTable[A], key: A): bool =
|
||||
proc hasKey*[A](t: CountTableRef[A], key: A): bool =
|
||||
## returns true iff `key` is in the table `t`.
|
||||
result = t[].hasKey(key)
|
||||
|
||||
proc `[]=`*[A](t: PCountTable[A], key: A, val: int) =
|
||||
proc `[]=`*[A](t: CountTableRef[A], key: A, val: int) =
|
||||
## puts a (key, value)-pair into `t`. `val` has to be positive.
|
||||
assert val > 0
|
||||
t[][key] = val
|
||||
|
||||
proc newCountTable*[A](initialSize=64): PCountTable[A] =
|
||||
proc newCountTable*[A](initialSize=64): CountTableRef[A] =
|
||||
## creates a new count table that is empty.
|
||||
##
|
||||
## `initialSize` needs to be a power of two. If you need to accept runtime
|
||||
|
|
@ -821,28 +821,28 @@ proc newCountTable*[A](initialSize=64): PCountTable[A] =
|
|||
new(result)
|
||||
result[] = initCountTable[A](initialSize)
|
||||
|
||||
proc newCountTable*[A](keys: openArray[A]): PCountTable[A] =
|
||||
proc newCountTable*[A](keys: openArray[A]): CountTableRef[A] =
|
||||
## creates a new count table with every key in `keys` having a count of 1.
|
||||
result = newCountTable[A](nextPowerOfTwo(keys.len+10))
|
||||
for key in items(keys): result[key] = 1
|
||||
|
||||
proc `$`*[A](t: PCountTable[A]): string =
|
||||
proc `$`*[A](t: CountTableRef[A]): string =
|
||||
## The `$` operator for count tables.
|
||||
dollarImpl()
|
||||
|
||||
proc inc*[A](t: PCountTable[A], key: A, val = 1) =
|
||||
proc inc*[A](t: CountTableRef[A], key: A, val = 1) =
|
||||
## increments `t[key]` by `val`.
|
||||
t[].inc(key, val)
|
||||
|
||||
proc smallest*[A](t: PCountTable[A]): tuple[key: A, val: int] =
|
||||
proc smallest*[A](t: CountTableRef[A]): tuple[key: A, val: int] =
|
||||
## returns the largest (key,val)-pair. Efficiency: O(n)
|
||||
t[].smallest
|
||||
|
||||
proc largest*[A](t: PCountTable[A]): tuple[key: A, val: int] =
|
||||
proc largest*[A](t: CountTableRef[A]): tuple[key: A, val: int] =
|
||||
## returns the (key,val)-pair with the largest `val`. Efficiency: O(n)
|
||||
t[].largest
|
||||
|
||||
proc sort*[A](t: PCountTable[A]) =
|
||||
proc sort*[A](t: CountTableRef[A]) =
|
||||
## sorts the count table so that the entry with the highest counter comes
|
||||
## first. This is destructive! You must not modify `t` afterwards!
|
||||
## You can use the iterators `pairs`, `keys`, and `values` to iterate over
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue