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

added prefix matching to critbits.nim

Browse source
This commit is contained in:
Araq 2015-11-10 15:28:34 +01:00
commit e9313dd362
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/pure/collections/critbits.nim
View file

@ -232,7 +232,7 @@ iterator mpairs*[T](c: var CritBitTree[T]): tuple[key: string, val: var T] =
## yields all (key, value)-pairs of `c`. The yielded values can be modified. ## yields all (key, value)-pairs of `c`. The yielded values can be modified.
for x in leaves(c.root): yield (x.key, x.val) for x in leaves(c.root): yield (x.key, x.val)
proc allprefixedAux[T](c: CritBitTree[T], key: string): Node[T] = proc allprefixedAux[T](c: CritBitTree[T], key: string; longestMatch: bool): Node[T] =
var p = c.root var p = c.root
var top = p var top = p
if p != nil: if p != nil:
@ -242,43 +242,51 @@ proc allprefixedAux[T](c: CritBitTree[T], key: string): Node[T] =
let dir = (1 + (ch.ord or p.otherBits.ord)) shr 8 let dir = (1 + (ch.ord or p.otherBits.ord)) shr 8
p = p.child[dir] p = p.child[dir]
if q.byte < key.len: top = p if q.byte < key.len: top = p
for i in 0 .. <key.len: if not longestMatch:
if p.key[i] != key[i]: return for i in 0 .. <key.len:
if p.key[i] != key[i]: return
result = top result = top
iterator itemsWithPrefix*[T](c: CritBitTree[T], prefix: string): string = iterator itemsWithPrefix*[T](c: CritBitTree[T], prefix: string;
## yields all keys starting with `prefix`. longestMatch=false): string =
let top = allprefixedAux(c, prefix) ## yields all keys starting with `prefix`. If `longestMatch` is true,
## the longest match is returned, it doesn't have to be a complete match then.
let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield x.key for x in leaves(top): yield x.key
iterator keysWithPrefix*[T](c: CritBitTree[T], prefix: string): string = iterator keysWithPrefix*[T](c: CritBitTree[T], prefix: string;
longestMatch=false): string =
## yields all keys starting with `prefix`. ## yields all keys starting with `prefix`.
let top = allprefixedAux(c, prefix) let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield x.key for x in leaves(top): yield x.key
iterator valuesWithPrefix*[T](c: CritBitTree[T], prefix: string): T = iterator valuesWithPrefix*[T](c: CritBitTree[T], prefix: string;
longestMatch=false): T =
## yields all values of `c` starting with `prefix` of the ## yields all values of `c` starting with `prefix` of the
## corresponding keys. ## corresponding keys.
let top = allprefixedAux(c, prefix) let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield x.val for x in leaves(top): yield x.val
iterator mvaluesWithPrefix*[T](c: var CritBitTree[T], prefix: string): var T = iterator mvaluesWithPrefix*[T](c: var CritBitTree[T], prefix: string;
longestMatch=false): var T =
## yields all values of `c` starting with `prefix` of the ## yields all values of `c` starting with `prefix` of the
## corresponding keys. The values can be modified. ## corresponding keys. The values can be modified.
let top = allprefixedAux(c, prefix) let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield x.val for x in leaves(top): yield x.val
iterator pairsWithPrefix*[T](c: CritBitTree[T], iterator pairsWithPrefix*[T](c: CritBitTree[T],
prefix: string): tuple[key: string, val: T] = prefix: string;
longestMatch=false): tuple[key: string, val: T] =
## yields all (key, value)-pairs of `c` starting with `prefix`. ## yields all (key, value)-pairs of `c` starting with `prefix`.
let top = allprefixedAux(c, prefix) let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield (x.key, x.val) for x in leaves(top): yield (x.key, x.val)
iterator mpairsWithPrefix*[T](c: var CritBitTree[T], iterator mpairsWithPrefix*[T](c: var CritBitTree[T],
prefix: string): tuple[key: string, val: var T] = prefix: string;
longestMatch=false): tuple[key: string, val: var T] =
## yields all (key, value)-pairs of `c` starting with `prefix`. ## yields all (key, value)-pairs of `c` starting with `prefix`.
## The yielded values can be modified. ## The yielded values can be modified.
let top = allprefixedAux(c, prefix) let top = allprefixedAux(c, prefix, longestMatch)
for x in leaves(top): yield (x.key, x.val) for x in leaves(top): yield (x.key, x.val)
proc `$`*[T](c: CritBitTree[T]): string = proc `$`*[T](c: CritBitTree[T]): string =