aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2007-08-27 02:49:40 +0000
committerThien-Thi Nguyen2007-08-27 02:49:40 +0000
commit8fa134424913ad16f2b95f1d1cb2992d3fd17059 (patch)
treeab65276cfe2595f0e9503f3008232d7e1a84d247
parent5fa11cc28db07e1ac0c06ad10fc45ed7caddb315 (diff)
downloademacs-8fa134424913ad16f2b95f1d1cb2992d3fd17059.tar.gz
emacs-8fa134424913ad16f2b95f1d1cb2992d3fd17059.zip
(avl-tree-del-balance1, avl-tree-del-balance2)
(avl-tree-do-del-internal, avl-tree-do-delete) (avl-tree-enter-balance1, avl-tree-enter-balance2): Use plain `let'.
-rw-r--r--lisp/emacs-lisp/avl-tree.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 7dd4d18da7c..074f8e7c772 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -129,8 +129,8 @@
129 129
130(defun avl-tree-del-balance1 (node branch) 130(defun avl-tree-del-balance1 (node branch)
131 ;; Rebalance a tree and return t if the height of the tree has shrunk. 131 ;; Rebalance a tree and return t if the height of the tree has shrunk.
132 (let* ((br (avl-tree-node-branch node branch)) 132 (let ((br (avl-tree-node-branch node branch))
133 p1 b1 p2 b2 result) 133 p1 b1 p2 b2 result)
134 (cond 134 (cond
135 ((< (avl-tree-node-balance br) 0) 135 ((< (avl-tree-node-balance br) 0)
136 (avl-tree-node-set-balance br 0) 136 (avl-tree-node-set-balance br 0)
@@ -178,8 +178,8 @@
178 t))))) 178 t)))))
179 179
180(defun avl-tree-del-balance2 (node branch) 180(defun avl-tree-del-balance2 (node branch)
181 (let* ((br (avl-tree-node-branch node branch)) 181 (let ((br (avl-tree-node-branch node branch))
182 p1 b1 p2 b2 result) 182 p1 b1 p2 b2 result)
183 (cond 183 (cond
184 ((> (avl-tree-node-balance br) 0) 184 ((> (avl-tree-node-balance br) 0)
185 (avl-tree-node-set-balance br 0) 185 (avl-tree-node-set-balance br 0)
@@ -227,7 +227,7 @@
227 t))))) 227 t)))))
228 228
229(defun avl-tree-do-del-internal (node branch q) 229(defun avl-tree-do-del-internal (node branch q)
230 (let* ((br (avl-tree-node-branch node branch))) 230 (let ((br (avl-tree-node-branch node branch)))
231 (if (avl-tree-node-right br) 231 (if (avl-tree-node-right br)
232 (if (avl-tree-do-del-internal br +1 q) 232 (if (avl-tree-do-del-internal br +1 q)
233 (avl-tree-del-balance2 node branch)) 233 (avl-tree-del-balance2 node branch))
@@ -238,7 +238,7 @@
238 238
239(defun avl-tree-do-delete (cmpfun root branch data) 239(defun avl-tree-do-delete (cmpfun root branch data)
240 ;; Return t if the height of the tree has shrunk. 240 ;; Return t if the height of the tree has shrunk.
241 (let* ((br (avl-tree-node-branch root branch))) 241 (let ((br (avl-tree-node-branch root branch)))
242 (cond 242 (cond
243 ((null br) 243 ((null br)
244 nil) 244 nil)
@@ -271,8 +271,8 @@
271 271
272(defun avl-tree-enter-balance1 (node branch) 272(defun avl-tree-enter-balance1 (node branch)
273 ;; Rebalance a tree and return t if the height of the tree has grown. 273 ;; Rebalance a tree and return t if the height of the tree has grown.
274 (let* ((br (avl-tree-node-branch node branch)) 274 (let ((br (avl-tree-node-branch node branch))
275 p1 p2 b2 result) 275 p1 p2 b2 result)
276 (cond 276 (cond
277 ((< (avl-tree-node-balance br) 0) 277 ((< (avl-tree-node-balance br) 0)
278 (avl-tree-node-set-balance br 0) 278 (avl-tree-node-set-balance br 0)
@@ -312,8 +312,8 @@
312 312
313(defun avl-tree-enter-balance2 (node branch) 313(defun avl-tree-enter-balance2 (node branch)
314 ;; Return t if the tree has grown. 314 ;; Return t if the tree has grown.
315 (let* ((br (avl-tree-node-branch node branch)) 315 (let ((br (avl-tree-node-branch node branch))
316 p1 p2 b2) 316 p1 p2 b2)
317 (cond 317 (cond
318 ((> (avl-tree-node-balance br) 0) 318 ((> (avl-tree-node-balance br) 0)
319 (avl-tree-node-set-balance br 0) 319 (avl-tree-node-set-balance br 0)