From 51b761d1205da66bc40498711eb068540a6ae2d3 Mon Sep 17 00:00:00 2001
From: jf-home <Orig5826@163.com>
Date: Sun, 1 Sep 2024 22:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86list=E4=BF=AE=E6=94=B9=E4=B8=BAnew?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/demo_list.c | 154 +++++++++++++++++++++++------------------------
 test/test_list.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 230 insertions(+), 77 deletions(-)

diff --git a/demo/demo_list.c b/demo/demo_list.c
index 4cddee3..c58b096 100644
--- a/demo/demo_list.c
+++ b/demo/demo_list.c
@@ -1,5 +1,5 @@
 /**
- * @file demo_list.c
+ * @file demo_list->c
  * @author wenjf (Orig5826@163.com)
  * @brief 
  * @version 0.1
@@ -18,128 +18,128 @@ static void demo_list_num(void)
     int index = 0;
     int len = sizeof(data) / sizeof(data[0]);
 
-    struct _list list;
-    list_init2(&list, sizeof(int), 64);
-    list.print_obj = print_num;
+    list_t list = list_new();
+    list_init2(list, sizeof(int), 64);
+    list->print_obj = print_num;
 
     printf("\n\n----- list_demo_num -----\n");
     printf("----- push -----\n");
     for (i = 0; i < len; i++)
     {
-        list.append(&list, &data[i]);
+        list->append(list, &data[i]);
     }
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- pop -----\n");
-    list.pop(&list, 9, NULL);
-    list.print(&list);
+    list->pop(list, 9, NULL);
+    list->print(list);
     printf("\n");
 
-    list.pop(&list, 0, NULL);
-    list.print(&list);
+    list->pop(list, 0, NULL);
+    list->print(list);
     printf("\n");
 
-    list.pop(&list, 4, NULL);
-    list.print(&list);
+    list->pop(list, 4, NULL);
+    list->print(list);
     printf("\n");
 
     printf("----- clear -----\n");
-    list.clear(&list);
-    list.print(&list);
+    list->clear(list);
+    list->print(list);
     printf("\n");
 
     printf("----- push -----\n");
     for (i = 0; i < len; i++)
     {
-        list.append(&list, &data[i]);
+        list->append(list, &data[i]);
     }
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- get -----\n");
     index = 0;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = 4;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = 9;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
 
     printf("----- set -----\n");
     index = 0;
     temp = 11;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = 4;
     temp = 22;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = 9;
     temp = 33;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
 
     printf("----- at like python -----\n");
     index = -1;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = -6;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = -10;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     printf("----- set like python -----\n");
     index = -1;
     temp = 99;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = -6;
     temp = 98;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     index = -10;
     temp = 97;
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = %2d\n", index, temp);
 
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- pop -----\n");
     for (i = 0; i < len + 1; i++)
     {
-        list.pop(&list, 0, &temp);
+        list->pop(list, 0, &temp);
 
-        if (list.empty(&list))
+        if (list->empty(list))
         {
             printf("----- empty -----\n");
             break;
         }
     }
 
-    list.destory(&list);
+    list_free(&list);
 }
 
 static void demo_list_struct(void)
@@ -154,121 +154,121 @@ static void demo_list_struct(void)
     int index = 0;
     int len = sizeof(data) / sizeof(data[0]);
 
-    struct _list list;
-    list_init2(&list, sizeof(struct _student), 64);
-    list.print_obj = print_struct;
+    list_t list = list_new();
+    list_init2(list, sizeof(struct _student), 64);
+    list->print_obj = print_struct;
 
     printf("\n\n----- list_demo_num -----\n");
     printf("----- push -----\n");
     for (i = 0; i < len; i++)
     {
-        list.append(&list, &data[i]);
+        list->append(list, &data[i]);
     }
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- pop -----\n");
-    list.pop(&list, 9, NULL);
-    list.print(&list);
+    list->pop(list, 9, NULL);
+    list->print(list);
     printf("\n");
 
-    list.pop(&list, 0, NULL);
-    list.print(&list);
+    list->pop(list, 0, NULL);
+    list->print(list);
     printf("\n");
 
-    list.pop(&list, 4, NULL);
-    list.print(&list);
+    list->pop(list, 4, NULL);
+    list->print(list);
     printf("\n");
 
     printf("----- clear -----\n");
-    list.clear(&list);
-    list.print(&list);
+    list->clear(list);
+    list->print(list);
     printf("\n");
 
     printf("----- push -----\n");
     for (i = 0; i < len; i++)
     {
-        list.append(&list, &data[i]);
+        list->append(list, &data[i]);
     }
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- at -----\n");
     index = 0;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = 4;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = 9;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
 
     printf("----- set -----\n");
     index = 0;
     temp.id = 11;
     sprintf(temp.name, "robot_%02d", temp.id);
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = 4;
     temp.id = 22;
     sprintf(temp.name, "robot_%02d", temp.id);
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = 9;
     temp.id = 33;
     sprintf(temp.name, "robot_%02d", temp.id);
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
 
     printf("----- at like python -----\n");
     index = -1;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = -6;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = -10;
-    list.get(&list, index, &temp);
+    list->get(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     printf("----- set like python -----\n");
     index = -1;
     temp.id = 99;
     sprintf(temp.name, "robot_%02d", temp.id);
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = -6;
     temp.id = 98;
     sprintf(temp.name, "robot_%02d", temp.id);
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     index = -10;
     //temp.id = 97;
@@ -277,27 +277,27 @@ static void demo_list_struct(void)
     // struct _student robot = {"robot", 97};
     // temp = robot;
     temp = (struct _student){"robot", 97};
-    list.set(&list, index, &temp);
+    list->set(list, index, &temp);
     printf("list[%4d] = ", index);
-    list.print_obj(&temp); printf("\n");
+    list->print_obj(&temp); printf("\n");
 
     printf("----- print -----\n");
-    list.print(&list);
+    list->print(list);
     printf("\n");
 
     printf("----- pop -----\n");
     for (i = 0; i < len + 1; i++)
     {
-        list.pop(&list, 0, &temp);
+        list->pop(list, 0, &temp);
 
-        if (list.empty(&list))
+        if (list->empty(list))
         {
             printf("----- empty -----\n");
             break;
         }
     }
 
-    list.destory(&list);
+    list_free(&list);
 }
 
 void demo_list(void)
diff --git a/test/test_list.c b/test/test_list.c
index 541785a..188343a 100644
--- a/test/test_list.c
+++ b/test/test_list.c
@@ -219,6 +219,159 @@ static void test_list_num(void)
 }
 
 #if 0
+static void demo_list_struct(void)
+{
+    int i = 0;
+    struct _student data[] = {
+        "zhao", 1001, "qian", 1002, "sun",   1003, "li",   1004,
+        "zhou", 1005, "wu",   1006, "zheng", 1007, "wang", 1008, 
+        "feng", 1009, "cheng",1010, 
+    };
+    struct _student  temp = {0};
+    int index = 0;
+    int len = sizeof(data) / sizeof(data[0]);
+
+    list_t list = NULL;
+    list = list_new();
+    list_init(list, sizeof(struct _student), 64);
+    list->print_obj = print_struct;
+
+    for (i = 0; i < len; i++)
+    {
+        TEST_ASSERT_TRUE(list->append(&list, &data[i]));
+    }
+    TEST_ASSERT_TRUE(list->pop(&list, 9, NULL));
+    list.print(&list);
+    printf("\n");
+
+    list.pop(&list, 0, NULL);
+    list.print(&list);
+    printf("\n");
+
+    list.pop(&list, 4, NULL);
+    list.print(&list);
+    printf("\n");
+
+    printf("----- clear -----\n");
+    list.clear(&list);
+    list.print(&list);
+    printf("\n");
+
+    printf("----- push -----\n");
+    for (i = 0; i < len; i++)
+    {
+        list.append(&list, &data[i]);
+    }
+    printf("----- print -----\n");
+    list.print(&list);
+    printf("\n");
+
+    printf("----- at -----\n");
+    index = 0;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = 4;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = 9;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+
+    printf("----- set -----\n");
+    index = 0;
+    temp.id = 11;
+    sprintf(temp.name, "robot_%02d", temp.id);
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = 4;
+    temp.id = 22;
+    sprintf(temp.name, "robot_%02d", temp.id);
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = 9;
+    temp.id = 33;
+    sprintf(temp.name, "robot_%02d", temp.id);
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    printf("----- print -----\n");
+    list.print(&list);
+    printf("\n");
+
+
+    printf("----- at like python -----\n");
+    index = -1;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = -6;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = -10;
+    list.get(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    printf("----- set like python -----\n");
+    index = -1;
+    temp.id = 99;
+    sprintf(temp.name, "robot_%02d", temp.id);
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = -6;
+    temp.id = 98;
+    sprintf(temp.name, "robot_%02d", temp.id);
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    index = -10;
+    //temp.id = 97;
+    //sprintf(temp.name, "robot_%02d", temp.id);
+    // temp = data[0];
+    // struct _student robot = {"robot", 97};
+    // temp = robot;
+    temp = (struct _student){"robot", 97};
+    list.set(&list, index, &temp);
+    printf("list[%4d] = ", index);
+    list.print_obj(&temp); printf("\n");
+
+    printf("----- print -----\n");
+    list.print(&list);
+    printf("\n");
+
+    printf("----- pop -----\n");
+    for (i = 0; i < len + 1; i++)
+    {
+        list.pop(&list, 0, &temp);
+
+        if (list.empty(&list))
+        {
+            printf("----- empty -----\n");
+            break;
+        }
+    }
+
+    list.destory(&list);
+}
+
+// #if 0
 static void test_list_struct(void)
 {
     uint32_t i = 0;