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

GC: AVL tree uses unsigned comparisons

Browse source
This commit is contained in:
Araq 2011-12-30 12:05:48 +01:00
commit 6a97bed6a7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/system/avltree.nim
View file

@ -92,13 +92,13 @@ proc find(root: PAvlNode, key: int): PAvlNode =
var it = root var it = root
while it != nil: while it != nil:
if it.key == key: return it if it.key == key: return it
it = it.link[ord(it.key < key)] it = it.link[ord(it.key <% key)]
proc inRange(root: PAvlNode, key: int): PAvlNode = proc inRange(root: PAvlNode, key: int): PAvlNode =
var it = root var it = root
while it != nil: while it != nil:
if it.key <= key and key <= it.upperBound: return it if it.key <=% key and key <=% it.upperBound: return it
it = it.link[ord(it.key < key)] it = it.link[ord(it.key <% key)]
proc contains(root: PAvlNode, key: int): bool {.inline.} = proc contains(root: PAvlNode, key: int): bool {.inline.} =
result = find(root, key) != nil result = find(root, key) != nil
@ -140,7 +140,7 @@ proc add(a: var TMemRegion, key, upperBound: int) =
s = t.link[1] s = t.link[1]
p = s p = s
while true: while true:
dir = ord(p.key < key) dir = ord(p.key <% key)
q = p.link[dir] q = p.link[dir]
if q == nil: break if q == nil: break
if q.balance != 0: if q.balance != 0:
@ -152,7 +152,7 @@ proc add(a: var TMemRegion, key, upperBound: int) =
# Update balance factors # Update balance factors
p = s p = s
while p != q: while p != q:
dir = ord(p.key < key) dir = ord(p.key <% key)
if dir == 0: dec p.balance if dir == 0: dec p.balance
else: inc p.balance else: inc p.balance
p = p.link[dir] p = p.link[dir]
@ -160,7 +160,7 @@ proc add(a: var TMemRegion, key, upperBound: int) =
# Save rebalance point for parent fix # Save rebalance point for parent fix
# Rebalance if necessary # Rebalance if necessary
if abs(s.balance) > 1: if abs(s.balance) > 1:
dir = ord(s.key < key) dir = ord(s.key <% key)
insertBalance(s, dir) insertBalance(s, dir)
# Fix parent # Fix parent
if q == head.link[1]: a.root = s if q == head.link[1]: a.root = s
@ -178,7 +178,7 @@ proc del(a: var TMemRegion, key: int) =
if it == nil: return if it == nil: return
elif it.key == key: break elif it.key == key: break
# Push direction and node onto stack # Push direction and node onto stack
upd[top] = ord(it.key < key) upd[top] = ord(it.key <% key)
up[top] = it up[top] = it
it = it.link[upd[top]] it = it.link[upd[top]]
inc top inc top