Changeset 3562 for trunk/kStuff/include/k/kAvlTmpl/kAvlEnum.h

Timestamp:

Aug 27, 2007, 12:31:38 AM (18 years ago)

Author:

bird

Message:

Made is possible to redefine the AVLNODE members, thus allowing a structure to be used by more than one kAvl instance (i.e. be in more than one tree). Define the callback and enumdata our selves.

File:

• trunk/kStuff/include/k/kAvlTmpl/kAvlEnum.h (modified) (9 diffs)

trunk/kStuff/include/k/kAvlTmpl/kAvlEnum.h

@@ -25 +25 @@
  */
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/**
+ * Enumeration control data.
+ *
+ * This is initialized by BeginEnum and used by GetNext to figure out what
+ * to do next.
+ */
+typedef struct KAVL_TYPE(,ENUMDATA)
+{
+    KBOOL               fFromLeft;
+    KI8                 cEntries;
+    KU8                 achFlags[KAVL_MAX_STACK];
+    KAVLNODE *          aEntries[KAVL_MAX_STACK];
+} KAVL_TYPE(,ENUMDATA), *KAVL_TYPE(P,ENUMDATA);
+
+
 /**
  * Get the next node in the tree enumeration.
- * @returns   Pointer to the first node in the tree.
- * @param     pEnumData  Pointer to enumeration control data.
- * @status    completely implemented.
- * @author    knut st. osmundsen
+ *
+ * @returns Pointer to the first node in the tree.
+ * @param   pEnumData   Pointer to enumeration control data.
  */
-KAVL_DECL(KAVLNODECORE *) KAVL_FN(GetNextNode)(KAVL_TYPE(,ENUMDATA) *pEnumData)
+KAVL_DECL(KAVLNODE *) KAVL_FN(GetNext)(KAVL_TYPE(,ENUMDATA) *pEnumData)
 {
     if (pEnumData->fFromLeft)
@@ -38 +55 @@
         while (pEnumData->cEntries > 0)
         {
-            KAVLNODECORE *pNode = pEnumData->aEntries[pEnumData->cEntries - 1];
+            KAVLNODE *pNode = pEnumData->aEntries[pEnumData->cEntries - 1];
 
             /* left */
@@ -44 +61 @@
             {
                 pEnumData->achFlags[pEnumData->cEntries - 1]++;
-                if (pNode->pLeft != KAVL_NULL)
+                if (pNode->mpLeft != KAVL_NULL)
                 {
                     pEnumData->achFlags[pEnumData->cEntries] = 0; /* 0 left, 1 center, 2 right */
-                    pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->pLeft);
+                    pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->mpLeft);
                     continue;
                 }
@@ -61 +78 @@
             /* right */
             pEnumData->cEntries--;
-            if (pNode->pRight != KAVL_NULL)
+            if (pNode->mpRight != KAVL_NULL)
             {
                 pEnumData->achFlags[pEnumData->cEntries] = 0;
-                pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->pRight);
+                pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->mpRight);
             }
         } /* while */
@@ -72 +89 @@
         while (pEnumData->cEntries > 0)
         {
-            KAVLNODECORE *pNode = pEnumData->aEntries[pEnumData->cEntries - 1];
+            KAVLNODE *pNode = pEnumData->aEntries[pEnumData->cEntries - 1];
 
             /* right */
@@ -78 +95 @@
             {
                 pEnumData->achFlags[pEnumData->cEntries - 1]++;
-                if (pNode->pRight != KAVL_NULL)
+                if (pNode->mpRight != KAVL_NULL)
                 {
                     pEnumData->achFlags[pEnumData->cEntries] = 0;  /* 0 right, 1 center, 2 left */
-                    pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->pRight);
+                    pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->mpRight);
                     continue;
                 }
@@ -95 +112 @@
             /* left */
             pEnumData->cEntries--;
-            if (pNode->pLeft != KAVL_NULL)
+            if (pNode->mpLeft != KAVL_NULL)
             {
                 pEnumData->achFlags[pEnumData->cEntries] = 0;
-                pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->pLeft);
+                pEnumData->aEntries[pEnumData->cEntries++] = KAVL_GET_POINTER(&pNode->mpLeft);
             }
         } /* while */
@@ -116 +133 @@
  *                      K_FALSE: Right to left.
  */
-KAVL_DECL(KAVLNODECORE *) KAVL_FN(BeginEnumTree)(KAVLTREEPTR *ppTree, KAVL_TYPE(,ENUMDATA) *pEnumData, KBOOL fFromLeft)
+KAVL_DECL(KAVLNODE *) KAVL_FN(BeginEnum)(KAVLTREEPTR *ppTree, KAVL_TYPE(,ENUMDATA) *pEnumData, KBOOL fFromLeft)
 {
     if (*ppTree != KAVL_NULL)
@@ -128 +145 @@
         pEnumData->cEntries = 0;
 
-    return KAVL_FN(GetNextNode)(pEnumData);
+    return KAVL_FN(GetNext)(pEnumData);
 }