mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

(avl-tree-del-balance1, avl-tree-del-balance2)

Browse source 
(avl-tree-do-del-internal, avl-tree-do-delete)
(avl-tree-enter-balance1, avl-tree-enter-balance2): Use plain `let'.
This commit is contained in:
Thien-Thi Nguyen 2007-08-27 02:49:40 +00:00
parent 5fa11cc28d
commit 8fa1344249
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/avl-tree.el
View file

@ -129,8 +129,8 @@
(defun avl-tree-del-balance1 (node branch) (defun avl-tree-del-balance1 (node branch)
;; Rebalance a tree and return t if the height of the tree has shrunk. ;; Rebalance a tree and return t if the height of the tree has shrunk.
(let* ((br (avl-tree-node-branch node branch)) (let ((br (avl-tree-node-branch node branch))
p1 b1 p2 b2 result) p1 b1 p2 b2 result)
(cond (cond
((< (avl-tree-node-balance br) 0) ((< (avl-tree-node-balance br) 0)
(avl-tree-node-set-balance br 0) (avl-tree-node-set-balance br 0)
@ -178,8 +178,8 @@
t))))) t)))))
(defun avl-tree-del-balance2 (node branch) (defun avl-tree-del-balance2 (node branch)
(let* ((br (avl-tree-node-branch node branch)) (let ((br (avl-tree-node-branch node branch))
p1 b1 p2 b2 result) p1 b1 p2 b2 result)
(cond (cond
((> (avl-tree-node-balance br) 0) ((> (avl-tree-node-balance br) 0)
(avl-tree-node-set-balance br 0) (avl-tree-node-set-balance br 0)
@ -227,7 +227,7 @@
t))))) t)))))
(defun avl-tree-do-del-internal (node branch q) (defun avl-tree-do-del-internal (node branch q)
(let* ((br (avl-tree-node-branch node branch))) (let ((br (avl-tree-node-branch node branch)))
(if (avl-tree-node-right br) (if (avl-tree-node-right br)
(if (avl-tree-do-del-internal br +1 q) (if (avl-tree-do-del-internal br +1 q)
(avl-tree-del-balance2 node branch)) (avl-tree-del-balance2 node branch))
@ -238,7 +238,7 @@
(defun avl-tree-do-delete (cmpfun root branch data) (defun avl-tree-do-delete (cmpfun root branch data)
;; Return t if the height of the tree has shrunk. ;; Return t if the height of the tree has shrunk.
(let* ((br (avl-tree-node-branch root branch))) (let ((br (avl-tree-node-branch root branch)))
(cond (cond
((null br) ((null br)
nil) nil)
@ -271,8 +271,8 @@
(defun avl-tree-enter-balance1 (node branch) (defun avl-tree-enter-balance1 (node branch)
;; Rebalance a tree and return t if the height of the tree has grown. ;; Rebalance a tree and return t if the height of the tree has grown.
(let* ((br (avl-tree-node-branch node branch)) (let ((br (avl-tree-node-branch node branch))
p1 p2 b2 result) p1 p2 b2 result)
(cond (cond
((< (avl-tree-node-balance br) 0) ((< (avl-tree-node-balance br) 0)
(avl-tree-node-set-balance br 0) (avl-tree-node-set-balance br 0)
@ -312,8 +312,8 @@
(defun avl-tree-enter-balance2 (node branch) (defun avl-tree-enter-balance2 (node branch)
;; Return t if the tree has grown. ;; Return t if the tree has grown.
(let* ((br (avl-tree-node-branch node branch)) (let ((br (avl-tree-node-branch node branch))
p1 p2 b2) p1 p2 b2)
(cond (cond
((> (avl-tree-node-balance br) 0) ((> (avl-tree-node-balance br) 0)
(avl-tree-node-set-balance br 0) (avl-tree-node-set-balance br 0)