From feffd2b3c75039899c626e3cc2ba607f35be24a8 Mon Sep 17 00:00:00 2001
From: wjf-hs <Orig5826@163.com>
Date: Mon, 2 Sep 2024 11:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8=EF=BC=9A=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E9=81=8D=E5=8E=86=E6=B5=8B=E8=AF=95=E9=80=9A=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tree.c       | 50 +++++++++++++++++++++++++++++++++++++++++-------
 test/test_tree.c | 23 +++++++++++-----------
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/tree.c b/src/tree.c
index 2fde542..a2079c1 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1538,7 +1538,35 @@ void* tree_begin(struct _tree* self)
     }break;
     case ORDER_LEFT_POST:
     {
+        struct _tree_node* node = self->_root;
+        stack_t stack = stack_new();
+        stack_init(stack, sizeof(struct _tree_node*));
+        while(!stack->empty(stack) || node != NULL)
+        {
+            if(node != NULL)
+            {
+                self->stack->push(self->stack, &node);
 
+                stack->push(stack, &node);
+                node = node->right;
+            }
+            else
+            {
+                stack->pop(stack, &node);
+                node = node->left;
+            }
+        }
+        stack_free(&stack);
+
+        if(!self->stack->empty(self->stack))
+        {
+            self->stack->pop(self->stack, &self->cur_node);
+        }
+        else
+        {
+            self->cur_node = NULL;
+        }
+        return self->cur_node == NULL ? NULL : self->cur_node->obj;
     }break;
     case ORDER_LEFT_BREADTH:
     {
@@ -1624,7 +1652,15 @@ void* tree_next(struct _tree* self)
     }break;
     case ORDER_LEFT_POST:
     {
-
+        if(!self->stack->empty(self->stack))
+        {
+            self->stack->pop(self->stack, &self->cur_node);
+        }
+        else
+        {
+            self->cur_node = NULL;
+        }
+        return self->cur_node == NULL ? NULL : self->cur_node->obj;
     }break;
     case ORDER_LEFT_BREADTH:
     {
@@ -1667,27 +1703,27 @@ void* tree_end(struct _tree* self)
     }break;
     case ORDER_LEFT_POST:
     {
-
+        return NULL;
     }break;
     case ORDER_LEFT_BREADTH:
     {
-
+        return NULL;
     }break;
     case ORDER_RIGHT_PRE:
     {
-
+        return NULL;
     }break;
     case ORDER_RIGHT_IN:
     {
-
+        return NULL;
     }break;
     case ORDER_RIGHT_POST:
     {
-
+        return NULL;
     }break;
     case ORDER_RIGHT_BREADTH:
     {
-
+        return NULL;
     }break;
     default:
     {
diff --git a/test/test_tree.c b/test/test_tree.c
index bd259b1..a5ccfce 100644
--- a/test/test_tree.c
+++ b/test/test_tree.c
@@ -545,36 +545,35 @@ static void test_tree_iter(void)
         TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array_orderpre_insert[i], buff, count);
     }
 
-    for(i = 1; i < 2; i++)
+    for(i = 1; i < 3; i++)
     {
         tree->set_order(tree, i);  //ORDER_LEFT_IN
-        printf("\n ----- iter test -----\n");
+        // printf("\n ----- iter test -----\n");
         for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
         {
-            printf("(%2d ) ", *iter);
+            // printf("(%2d ) ", *iter);
             buff[count++] = *iter;
         }
-        printf("\n");
-        TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[1], buff, count);
+        // printf("\n");
+        TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[i], buff, count);
     }
 
-    printf("insert = ");
-    tree->print_obj(&temp);
-    printf("size = %2d : \n", tree->size(tree));
-    tree->inorder(tree, tree->_root);
+    printf("\n\nactual data = \n");
+    tree->postorder(tree, tree->_root);
     printf("\n");
 
     // set order
     // tree->set_order(tree, ORDER_LEFT_PRE);
-    tree->set_order(tree, ORDER_LEFT_IN);
-    printf("\n ----- iter test -----\n");
+    // tree->set_order(tree, ORDER_LEFT_IN);
+    tree->set_order(tree, ORDER_LEFT_POST);
+    printf("\n ----- iter data -----\n");
     for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
     {
         printf("(%2d ) ", *iter);
         buff[count++] = *iter;
     }
     printf("\n");
-    TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[2], buff, count);
+    TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[3], buff, count);
 
     TEST_ASSERT_FALSE(tree->empty(tree));
     TEST_ASSERT_TRUE(tree->clear(tree));