From 36707a4b7270d99238bb6ff8b86d75382d9ffbfc Mon Sep 17 00:00:00 2001
From: wjf-hs <Orig5826@163.com>
Date: Mon, 2 Sep 2024 10:36:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BA=8F=E9=81=8D=E5=8E=86=E6=B5=8B?=
 =?UTF-8?q?=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       | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 test/test_tree.c | 30 ++++++++++++++++++++++--------
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/src/tree.c b/src/tree.c
index a3c1236..2fde542 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1511,7 +1511,30 @@ void* tree_begin(struct _tree* self)
     }break;
     case ORDER_LEFT_IN:
     {
+        struct _tree_node* node = NULL;
+        self->cur_node = self->_root;
 
+        while(!self->stack->empty(self->stack) || self->cur_node != NULL)
+        {
+            if(self->cur_node != NULL)
+            {
+                self->stack->push(self->stack, &self->cur_node);
+                self->cur_node = self->cur_node->left;
+            }
+            else
+            {
+                self->stack->pop(self->stack, &self->cur_node);
+                // self->print_obj(self->cur_node->obj);
+                node = self->cur_node;
+                self->cur_node = self->cur_node->right;
+                break;
+            }
+        }
+        if(node == NULL)
+        {
+            return NULL;
+        }
+        return node->obj;
     }break;
     case ORDER_LEFT_POST:
     {
@@ -1576,7 +1599,28 @@ void* tree_next(struct _tree* self)
     }break;
     case ORDER_LEFT_IN:
     {
-
+        struct _tree_node* node = NULL;
+        while(!self->stack->empty(self->stack) || self->cur_node != NULL)
+        {
+            if(self->cur_node != NULL)
+            {
+                self->stack->push(self->stack, &self->cur_node);
+                self->cur_node = self->cur_node->left;
+            }
+            else
+            {
+                self->stack->pop(self->stack, &self->cur_node);
+                // self->print_obj(self->cur_node->obj);
+                node = self->cur_node;
+                self->cur_node = self->cur_node->right;
+                break;
+            }
+        }
+        if(node == NULL)
+        {
+            return NULL;
+        }
+        return node->obj;
     }break;
     case ORDER_LEFT_POST:
     {
@@ -1619,7 +1663,7 @@ void* tree_end(struct _tree* self)
     }break;
     case ORDER_LEFT_IN:
     {
-
+        return NULL;
     }break;
     case ORDER_LEFT_POST:
     {
diff --git a/test/test_tree.c b/test/test_tree.c
index 90c1f87..bd259b1 100644
--- a/test/test_tree.c
+++ b/test/test_tree.c
@@ -544,15 +544,29 @@ static void test_tree_iter(void)
         }
         TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array_orderpre_insert[i], buff, count);
     }
-    // printf("insert = ");
-    // tree->print_obj(&temp);
-    // printf("size = %2d : \n", tree->size(tree));
-    // tree->preorder(tree, tree->_root);
-    // printf("\n");
+
+    for(i = 1; i < 2; i++)
+    {
+        tree->set_order(tree, i);  //ORDER_LEFT_IN
+        printf("\n ----- iter test -----\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[1], buff, count);
+    }
+
+    printf("insert = ");
+    tree->print_obj(&temp);
+    printf("size = %2d : \n", tree->size(tree));
+    tree->inorder(tree, tree->_root);
+    printf("\n");
 
     // set order
-    tree->set_order(tree, ORDER_LEFT_PRE);
-    // tree->set_order(tree, ORDER_LEFT_IN);
+    // tree->set_order(tree, ORDER_LEFT_PRE);
+    tree->set_order(tree, ORDER_LEFT_IN);
     printf("\n ----- iter test -----\n");
     for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
     {
@@ -560,7 +574,7 @@ static void test_tree_iter(void)
         buff[count++] = *iter;
     }
     printf("\n");
-    TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[1], buff, count);
+    TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[2], buff, count);
 
     TEST_ASSERT_FALSE(tree->empty(tree));
     TEST_ASSERT_TRUE(tree->clear(tree));