jar3m
diff --git a/‎Defs.make‎
Lines changed: 2 additions & 1 deletion b/‎Defs.make‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎ds/Makefile‎
Lines changed: 10 additions & 1 deletion b/‎ds/Makefile‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎ds/queue/queue.c‎
Lines changed: 1 addition & 1 deletion b/‎ds/queue/queue.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎ds/stack/stack.c‎
Lines changed: 2 additions & 1 deletion b/‎ds/stack/stack.c‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎ds/tree/Makefile‎
Lines changed: 15 additions & 0 deletions b/‎ds/tree/Makefile‎
Lines changed: 15 additions & 0 deletions
@@ -38,4 +38,5 @@ DS_FLAGS = -DLINK_LIST=$(LINK_LIST) -DSTACK=$(STACK) \
 	@echo "STACKS= $(STACK)"
 	@echo "QUEUES= $(QUEUE)"
 	@echo "HEAPS= $(HEAP)"
-	@echo "TREES= $(TREE)"
+	@echo "TREES= $(TREE)"
+
@@ -3,6 +3,7 @@ link_list_ARCHIVE=$(PROJ_PATH)/ds/link_list/link_list.o
 stack_ARCHIVE=$(PROJ_PATH)/ds/stack/stack.o
 queue_ARCHIVE=$(PROJ_PATH)/ds/queue/queue.o
 heap_ARCHIVE=$(PROJ_PATH)/ds/heap/heap.o
+tree_ARCHIVE=$(PROJ_PATH)/ds/tree/tree.o
 
 ds_ARCHIVE=$(PROJ_PATH)/ds/bin/ds.a
 
@@ -14,7 +15,7 @@ sub_ARCHIVE += $(link_list_ARCHIVE)
 endif
 
 ifeq ($(STACK), true)
-INCLUDES += -I $(PROJ_PATH)/ds/stacks/
+INCLUDES += -I $(PROJ_PATH)/ds/stack/
 sub_ARCHIVE += $(stack_ARCHIVE)
 endif
 
@@ -28,6 +29,11 @@ INCLUDES += -I $(PROJ_PATH)/ds/heap/
 sub_ARCHIVE += $(heap_ARCHIVE)
 endif
 
+ifeq ($(TREE), true)
+INCLUDES += -I $(PROJ_PATH)/ds/tree/
+sub_ARCHIVE += $(tree_ARCHIVE)
+endif
+
 all: $(ds_ARCHIVE)
 
 $(ds_ARCHIVE): $(sub_ARCHIVE)
@@ -47,6 +53,9 @@ $(queue_ARCHIVE) :
 $(heap_ARCHIVE) :
 	make -C heap/ all
 
+$(tree_ARCHIVE) :
+	make -C tree/ all
+
 clean:
 	rm -rf $(ds_ARCHIVE) $(sub_ARCHIVE)
 
 
@@ -87,7 +87,7 @@ void queue_enqueue_arr(t_gen d, t_gen data)
 	if (q->full(q) == true) {
 		LOG_WARN("QUEUES", "%s: Queue Full\n",q->name);
 	}
-	
+
 	// queue empty (added first element)
 	q->front  = (q->front != -1) ? q->front : 0;
 
 
@@ -302,7 +302,7 @@ t_gen stack_peek(t_gen d,int idx)
 	t_gen n;
 
 	// index out of bound
-	if ((idx < 0) && (idx >= s->count)) {
+	if ((idx < 0) || (idx >= s->count)) {
 		LOG_WARN("STACKS", "index is out of bounds\n", s->count);
 		return NULL;
 	}
@@ -313,6 +313,7 @@ t_gen stack_peek(t_gen d,int idx)
 	}
 
 	// Return data for link list based stack
+	l = (t_linklist*)s->data;
 	n = l->get_idx(l, idx);
 
 	return l->get_node_data(n);
 
@@ -0,0 +1,15 @@
+tree_SRC=tree.c
+tree_OBJ=tree.o
+
+OBJS=$(tree_OBJ)
+
+all: $(OBJS)
+
+$(tree_OBJ): $(tree_SRC)
+	$(CC) $(INCLUDES) -c $^ -o $@ $(CFLAGS) 
+
+
+.PHONY: clean
+
+clean:
+	rm -rf $(tree_ARCHIVE) $(OBJS)
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void queue_enqueue_arr(t_gen d, t_gen data)`
`87`	`87`	`if (q->full(q) == true) {`
`88`	`88`	`LOG_WARN("QUEUES", "%s: Queue Full\n",q->name);`
`89`	`89`	`}`
`90`		`-`
	`90`	`+`
`91`	`91`	`// queue empty (added first element)`
`92`	`92`	`q->front = (q->front != -1) ? q->front : 0;`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ t_gen stack_peek(t_gen d,int idx)`
`302`	`302`	`t_gen n;`
`303`	`303`
`304`	`304`	`// index out of bound`
`305`		`- if ((idx < 0) && (idx >= s->count)) {`
	`305`	`+ if ((idx < 0) \|\| (idx >= s->count)) {`
`306`	`306`	`LOG_WARN("STACKS", "index is out of bounds\n", s->count);`
`307`	`307`	`return NULL;`
`308`	`308`	`}`
`@@ -313,6 +313,7 @@ t_gen stack_peek(t_gen d,int idx)`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`// Return data for link list based stack`
	`316`	`+ l = (t_linklist*)s->data;`
`316`	`317`	`n = l->get_idx(l, idx);`
`317`	`318`
`318`	`319`	`return l->get_node_data(n);`