update clang queue

Author: nange

c/queue/queue.c

@@ -10,9 +10,66 @@ Queue *queueCreate() {
 	Queue *q = malloc(sizeof(Queue));
 	assert(q);
 	q->theSize = 0;
-	q->capacity = 0;
-	q->dataStore
+	q->capacity = DEFAULT_QUEUE_SIZE;
+	q->dataStore = malloc(sizeof(void *) * DEFAULT_QUEUE_SIZE);
 
+	q->enqueue = queueEnqueue;
+	q->dequeue = queueDequeue;
+	q->size = queueSize;
+	q->isEmpty = queueIsEmpty;
+	q->font = queueFont;
+	q->end = queueEnd;
+	q->destory = queueDestory;
 }
 
+void queueShouldRealloc(Queue *q) {
+	if (q->theSize == q->capacity) {
+		q->capacity = q->capacity * 2;
+		q->dataStore = realloc(q->dataStore, sizeof(void *) * q->capacity);
+	}
+}
+
+void queueEnqueue(Queue *q, void *element) {
+	queueShouldRealloc(q);
+	q->dataStore[q->theSize++] = element;
+}
+
+void* queueDequeue(Queue *q) {
+	if (q->theSize == 0) return NULL;
+	void *d = q->dataStore[0];
+	if (q->theSize > 1) {
+		int i;
+		for (i = 0; i < q->theSize-1; i++) {
+			q->dataStore[i] = q->dataStore[i+1];
+		}
+	}
+	q->theSize--;
+	return d;
+}
+
+int queueSize(Queue *q) {
+	return q->theSize;
+}
+
+bool queueIsEmpty(Queue *q) {
+	return q->theSize == 0;
+}
 
+void *queueFont(Queue *q) {
+	if (q->theSize == 0) return NULL;
+	return q->dataStore[0];
+}
+
+void *queueEnd(Queue *q) {
+	if (q->theSize == 0) return NULL;
+	return q->dataStore[q->theSize-1];
+}
+
+void queueClear(Queue *q) {
+	q->theSize = 0;
+}
+
+void queueDestory(Queue *q) {
+	free(q->dataStore);
+	free(q);
+}

c/queue/queue.h

@@ -10,9 +10,10 @@ typedef struct Queue {
 	void *(*dequeue)();
 	int (*size)();
 	bool (*isEmpty)();
-	void *(font)();
-	void *(end)();
-	void (clear)();
+	void *(*font)();
+	void *(*end)();
+	void (*clear)();
+	void (*destory)();
 } Queue;
 
 /* Prototypes */
@@ -24,5 +25,6 @@ bool queueIsEmpty(Queue *);
 void *queueFont(Queue *);
 void *queueEnd(Queue *);
 void queueClear(Queue *);
+void queueDestory(Queue *);
 
-#endif __QUEUE_H__
+#endif /*__QUEUE_H__*/

c/queue/queue_test.c

@@ -0,0 +1,32 @@
+#include <assert.h>
+#include <stdio.h>
+#include "queue.c"
+
+int main() {
+	printf("\nRunning queue.c tests.\n\n");
+
+	Queue *q = queueCreate();
+	assert(q->isEmpty(q));
+  	assert(q->size(q) == 0);
+
+	int n1 = 1, n2 = 2, n3 = 3;
+	int *p1 = &n1, *p2 = &n2, *p3 = &n3;
+	q->enqueue(q, p1);
+	q->enqueue(q, p2);
+	q->enqueue(q, p3);
+	assert(q->size(q) == 3);
+	
+	int d = *(int*)(q->dequeue(q));
+	assert(q->size(q) == 2);
+	assert(d == 1);
+	
+	int d2 = *(int*)q->font(q);
+	int d3 = *(int*)q->end(q);
+	assert(d2 == 2);
+	assert(d3 == 3);
+	
+	q->destory(q);
+
+	printf("All queue.c tests completed.\n\n");
+  	return 0;
+}

c/stack/stack.c

@@ -28,7 +28,7 @@ Stack *stackCreate() {
 void stackShouldRealloc(Stack *s) {
   if (s->top == s->capacity) {
     s->capacity = s->capacity*2;
-    s->dataStore = realloc(s->dataStore, sizeof(void *)*s->capacity);
+    s->dataStore = realloc(s->dataStore, sizeof(void *) * s->capacity);
   }
 }