Changeset 3212 for trunk/tools/fastdep/avl.c

Timestamp:

Mar 24, 2000, 2:40:52 AM (25 years ago)

Author:

bird

Message:

Corrected test for equal key in AVLInsert.

File:

• trunk/tools/fastdep/avl.c (modified) (3 diffs)

trunk/tools/fastdep/avl.c

@@ -1 @@
-/* $Id: avl.c,v 1.1 2000-03-16 21:10:10 bird Exp $
+/* $Id: avl.c,v 1.2 2000-03-24 01:40:52 bird Exp $
  *
  * AVL-Tree (lookalike) implementation.
@@ -93 +93 @@
     {
         assert(AVLStack.cEntries < AVL_MAX_HEIGHT);
+        assert(pNode != pCurNode);
         AVLStack.aEntries[AVLStack.cEntries++] = ppCurNode;
+        #ifdef AVL_MAY_TRY_INSERT_EQUAL
+        /* check if equal */
+        if (AVL_E(pCurNode->Key, Key))
+            return FALSE;
+        #endif
         if (AVL_G(pCurNode->Key, Key))
             ppCurNode = &pCurNode->pLeft;
@@ -99 +105 @@
             ppCurNode = &pCurNode->pRight;
     }
-
-#ifdef AVL_MAY_TRY_INSERT_EQUAL
-    /* check if equal */
-    if (AVLStack.cEntries > 0 && AVL_E((*AVLStack.aEntries[AVLStack.cEntries-1])->Key, pNode->Key))
-        return FALSE;
-#endif
 
     pNode->pLeft = pNode->pRight = NULL;