update clang

Author: nange

c/arraylist/arraylist.c

@@ -1,27 +1,59 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-
 #include "arraylist.h"
 
-const int DEFAULT_CAPACITY = 10;
+#define ARRAYLIST_DEAUFALT_SIZE 4
 
 /**
  * create a new empty arraylist
  */
 ArrayList *listCreate() {
 	ArrayList *list = malloc(sizeof(ArrayList));
+	
+	list->dataStore = malloc(sizeof(void *) * ARRAYLIST_DEAUFALT_SIZE);
+	assert(list->dataStore);
 	list->theSize = 0;
-	list->dataStore = malloc(sizeof(void *) * DEFAULT_CAPACITY);
+	list->capacity = ARRAYLIST_DEAUFALT_SIZE;
 
 	list->size = listSize;
+	list->get = listGet;
+	list->set = listSet;
+	list->append = listAppend;
 
 	return list;
 }
 
+void listIsRealloc(ArrayList *list) {
+	if (list->theSize == list->capacity) {
+		unsigned int newCapa = list->capacity * 2;
+		list->capacity = newCapa;
+		list->dataStore = realloc(list->dataStore, sizeof(void *) * newCapa);
+		assert(list->dataStore);
+	}
+}
+
 int listSize(ArrayList *list) {
 	return list->theSize;
 }
 
+void *listGet(ArrayList *list, unsigned int index) {
+	assert(index < list->theSize);
+	return list->dataStore[index];
+}
+
+void listSet(ArrayList *list, unsigned int index, void *value) {
+	assert(index < list->theSize);
+	list->dataStore[index] = value;
+}
+
+void listAppend(ArrayList *list, void *value) {
+	listIsRealloc(list);
+	list->dataStore[list->theSize++] = value;
+}
+
+
+
+
 
 

c/arraylist/arraylist.h

@@ -2,13 +2,14 @@
 #define __ARRAYLIST_H__
 
 typedef struct ArrayList {
-	unsigned int theSize;
-	void *dataStore;
+	int theSize;
+	int capacity;
+	void **dataStore;
 
-	int (*size)();
-	//void *(*get)(ArrayList *, unsigned int);
-	//void (*set)(ArrayList *, unsigned int, void *);
-	//void (*append)(ArrayList *, void *);
+	int (*size)(struct ArrayList *);
+	void *(*get)(struct ArrayList *, unsigned int);
+	void (*set)(struct ArrayList *, unsigned int, void *);
+	void (*append)(struct ArrayList *, void *);
 	//void (*insertAfter)(ArrayList *, unsigned int, void *);
 	//void (*remove)(ArrayList *, unsigned int);
 	//void (*clear)(ArrayList *);

c/arraylist/arraylist_test.c

@@ -1,8 +1,33 @@
+#include <assert.h>
 #include <stdio.h>
-
 #include "arraylist.c"
 
 int main() {
 	ArrayList *list = listCreate();
-	printf("list size: %d\n", list->size(list));
+	assert(list->size(list) == 0);
+	
+	int a = 1;
+	list->append(list, &a);
+	assert(list->size(list) == 1);
+	
+	int item1 = *(int *)list->get(list, 0);
+	assert(item1 == 1);
+	
+	char c = 'c';
+	list->append(list, &c);
+	assert(list->size(list) == 2);
+	
+	char item2 = *(char *)list->get(list, 1);
+	assert(item2 == 'c');
+	
+	int b = 2;
+	list->set(list, 1, &b);
+	assert(list->size(list) == 2);
+	
+	int item2_new = *(int *)list->get(list, 1);
+	assert(item2_new == 2);
+	
+	printf("\n ArrayList test pass...\n\n");
+	return 0;
 }
+