add list

src/list.c

@@ -0,0 +1,115 @@
+#include "list.h"
+#include "gc_prelude.h"
+
+struct list {
+    int64_t size;
+    ListIter prebegin;
+    ListIter end;
+};
+
+struct list_node {
+    ListIter prev;
+    ListIter next;
+    Object value;
+};
+
+static ListIter new_ListIter() {
+    ListIter self = malloc(sizeof(struct list_node));
+    self->prev = NULL;
+    self->next = NULL;
+    self->value = NULL;
+    return self;
+}
+
+List new_List() {
+    List self = malloc(sizeof(struct list));
+    self->size = 0;
+    self->prebegin = new_ListIter();
+    self->end = new_ListIter();
+    self->prebegin->next = self->end;
+    self->end->prev = self->prebegin;
+    return self;
+}
+
+int64_t  List_size(List self) {
+    return self->size;
+}
+
+ListIter List_begin(List self) {
+    return self->prebegin->next;
+}
+
+ListIter List_end(List self) {
+    return self->end;
+}
+
+ListIter List_getIter(List self, int n) {
+    ListIter ret = self->prebegin->next;
+    for (int i = 0; i < n; i++) {
+        if (ret == NULL) return ret;
+        ret = ret->next;
+    }
+    return ret;
+}
+
+Object   List_get(List self, int n) {
+    return List_getIter(self, n)->value;
+}
+
+Object   List_front(List self) {
+    return List_begin(self)->value;
+}
+
+Object   List_back(List self) {
+    return List_end(self)->prev->value;
+}
+
+void List_insert(List self, ListIter iter, Object obj) {
+    ListIter prev = iter->prev;
+    ListIter next = iter;
+    ListIter new = new_ListIter();
+    new->prev = prev;
+    new->next = next;
+    next->prev = new;
+    prev->next = new;
+    new->value = obj;
+    self->size++;
+}
+
+void List_remove(List self, ListIter iter) {
+    ListIter prev = iter->prev;
+    ListIter next = iter->next;
+    prev->next = next;
+    next->prev = prev;
+    self->size--;
+}
+
+void List_pushBack(List self, Object obj) {
+    List_insert(self, List_end(self), obj);
+}
+
+void List_pushFront(List self, Object obj) {
+    List_insert(self, List_begin(self), obj);
+}
+
+void List_popBack(List self) {
+    if (self->end->prev == self->prebegin) return;
+    List_remove(self, List_end(self)->prev);        
+}
+
+void List_popFront(List self) {
+    if (self->prebegin->next = self->end) return;
+    List_remove(self, self->prebegin->next);
+}
+
+ListIter ListIter_next(ListIter self) {
+    return self->next;
+}
+
+ListIter ListIter_prev(ListIter self) {
+    return self->prev;
+}
+
+Object   ListIter_getValue(ListIter self) {
+    return self->value;
+}

src/list.h

@@ -0,0 +1,35 @@
+#ifndef DYMC_LIST_H_
+#define DYMC_LIST_H_
+
+#include "basic_types.h"
+
+typedef struct list *List;
+typedef struct list_node *ListIter;
+
+List new_List();
+
+int64_t  List_size(List self);
+ListIter List_begin(List self);
+ListIter List_end(List self);
+
+ListIter List_getIter(List self, int n);
+Object   List_get(List self, int n);
+Object   List_front(List self);
+Object   List_back(List self);
+
+void List_insert(List self, ListIter iter, Object obj);
+void List_remove(List self, ListIter iter);
+void List_pushBack(List self, Object obj);
+void List_pushFront(List self, Object obj);
+
+void List_popBack(List self);
+void List_popFront(List self);
+
+ListIter ListIter_next(ListIter self);
+ListIter ListIter_prev(ListIter self);
+Object   ListIter_getValue(ListIter self);
+
+
+#endif
+
+

src/str.c

@@ -9,17 +9,17 @@
 #include <string.h>
 
 #include "gc_prelude.h"
-#include "vector.h"
+#include "basic_types.h"
 
-void* str_split(String str, char delim) {
-    void* ret = new_Vector();
+Vector String_split(String str, char delim) {
+    Vector ret = new_Vector();
 
     if (str == NULL) return NULL;
     if (*str == '\n') {
         return ret;
     }
     int count = 0;
-    const char *begin = str;
+    String begin = str;
     for (const char *p = str; *p != '\0'; p++) {
         if (*p != delim && !(delim == '\0' && isspace(*p))) {
             continue;
@@ -42,7 +42,7 @@ void* str_split(String str, char delim) {
             begin = p + 1;
             continue;
         }
-        char *buf = malloc(sizeof(char) * (size + 1));
+        char* buf = malloc(sizeof(char) * (size + 1));
         buf[size] = '\0';
         memcpy(buf, begin, size * sizeof(char));
         begin = p + 1;

src/str.h

@@ -5,10 +5,10 @@
 #include <stddef.h>
 
 #include "basic_types.h"
-// #include "list.h"
+#include "vector.h"
 
 String String_strip(String s);
-// List String_split(String str, char delim);
+Vector String_split(String str, char delim);
 
 // StringBuilder
 typedef struct string_builder* StringBuilder;

tests/test_list.c

@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <assert.h>
+
+#include "list.h"
+
+
+int main() {
+    List lst = new_List();
+    assert(List_size(lst) == 0);
+    assert(List_front(lst) == NULL);
+    assert(List_back(lst) == NULL);
+
+    List_pushBack(lst, new_Integer(1));
+    List_pushBack(lst, new_Integer(2));
+    List_pushBack(lst, new_Integer(3));
+    List_pushBack(lst, new_Integer(4));
+
+    assert(List_size(lst) == 4);
+    assert(*(Integer)List_front(lst) == 1);
+    assert(*(Integer)List_back(lst) == 4);
+
+    List_remove(lst, List_getIter(lst, 1));
+    assert(List_size(lst) == 3);
+    assert(*(Integer)ListIter_getValue(List_getIter(lst, 2)) == 4);
+
+    printf("[PASSED] List\n");
+}

tests/test_list.h

@@ -0,0 +1,21 @@
+#include <stdio.h>
+
+#include "list.h"
+
+int main() {
+    List lst = new_List();
+    assert(List_size(lst) == 0);
+    assert(List_front(lst) == NULL);
+    assert(List_back(lst) == NULL);
+
+    List_pushBack(lst, new_Integer(1));
+    List_pushBack(lst, new_Integer(2));
+    List_pushBack(lst, new_Integer(3));
+    List_pushBack(lst, new_Integer(4));
+
+    assert(List_size(lst) == 4);
+    assert(*(Integer)List_front(lst) == 1);
+    assert(*(Integer)List_back(lst) == 4);
+
+    printf("[PASSED] List")
+}

tests/test_string.c

@@ -13,13 +13,13 @@ int main() {
     assert(strcmp("test 1, 2", StringBuilder_getString(builder)) == 0);
     assert(StringBuilder_size(builder) == 9);
 
-    // String s = "a,bc,def";
-    // List str_list = str_split(s, ',');
-    // assert(vec_size(str_list) == 3);
-    // assert(strcmp("a", vec_get(str_list, 0)) == 0);
-    // assert(strcmp("bc", vec_get(str_list, 1)) == 0);
-    // assert(strcmp("def", vec_get(str_list, 2)) == 0);
+    String s = "a,bc,def";
+    Vector str_list = String_split(s, ',');
+    assert(Vector_size(str_list) == 3);
+    assert(strcmp("a", (String)Vector_get(str_list, 0)) == 0);
+    assert(strcmp("bc", (String)Vector_get(str_list, 1)) == 0);
+    assert(strcmp("def", (String)Vector_get(str_list, 2)) == 0);
 
-    printf("[PASSED] STRING\n");
+    printf("[PASSED] String\n");
     return 0;
 }