Merge pull request #22 from Garz4/main

Sort things up
zoningorg · Dec 3, 2023 · 48a50f9 · 48a50f9
2 parents 95f5e45 + 466ed41
commit 48a50f9
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 24 deletions.
diff --git a/DataStructures/src/array.h → DataStructures/inc/array.h b/DataStructures/src/array.h → DataStructures/inc/array.h
diff --git a/DataStructures/src/hash_map.h → DataStructures/inc/hash_map.h b/DataStructures/src/hash_map.h → DataStructures/inc/hash_map.h
diff --git a/DataStructures/src/hash_set.h → DataStructures/inc/hash_set.h b/DataStructures/src/hash_set.h → DataStructures/inc/hash_set.h
diff --git a/DataStructures/src/linked_list.h → DataStructures/inc/linked_list.h b/DataStructures/src/linked_list.h → DataStructures/inc/linked_list.h
diff --git a/DataStructures/src/memory.h → DataStructures/inc/memory.h b/DataStructures/src/memory.h → DataStructures/inc/memory.h
diff --git a/DataStructures/src/sort_map.h → DataStructures/inc/sort_map.h b/DataStructures/src/sort_map.h → DataStructures/inc/sort_map.h
diff --git a/DataStructures/src/sort_set.h → DataStructures/inc/sort_set.h b/DataStructures/src/sort_set.h → DataStructures/inc/sort_set.h
diff --git a/DataStructures/makefile b/DataStructures/makefile
@@ -15,33 +15,33 @@
 # https://github.com/zoningorg/zoning/blob/main/LICENSE
 
 CC = gcc
-CFLAGS = -Wall -Werror -Wpedantic
-INC = ./src/linked_list.h ./src/sort_set.h
-SRC = $(INC:.h=.c)
-OBJ = $(INC:.h=.o)
+CFLAGS = -Wall -Werror -Wpedantic -I./inc/
+INC = ./inc/linked_list.h ./inc/sort_set.h
+SRC = $(patsubst ./inc/%.h,./src/%.c,$(INC))
+OBJ = $(patsubst ./inc/%.h,./obj/%.o,$(INC))
 
 all: test
 test: hash_map_test hash_set_test linked_list_test sort_map_test sort_set_test
 	( ./hash_map_test && ./hash_set_test && ./linked_list_test \
 		&& ./sort_map_test && ./sort_set_test ) ; make clean
 
-./src/%.o: ./src/%.c
-	gcc -c $< -o $@
+./obj/%.o: ./src/%.c
+	$(CC) $(CFLAGS) -c $^ -o $@
 
 linked_list_test: test/linked_list_test.c $(OBJ)
-	$(CC) $(CFLAGS) $(INC) test/linked_list_test.c -o linked_list_test $(OBJ)
+	$(CC) $(CFLAGS) $(INC) $< -o $@ $(OBJ)
 
 hash_map_test: test/hash_map_test.c $(OBJ)
-	$(CC) $(CFLAGS) $(INC) test/hash_map_test.c -o hash_map_test $(OBJ)
+	$(CC) $(CFLAGS) $(INC) $< -o $@ $(OBJ)
 
 hash_set_test: test/hash_set_test.c $(OBJ)
-	$(CC) $(CFLAGS) $(INC) test/hash_set_test.c -o hash_set_test $(OBJ)
+	$(CC) $(CFLAGS) $(INC) $< -o $@ $(OBJ)
 
 sort_map_test: test/sort_map_test.c $(OBJ)
-	$(CC) $(CFLAGS) $(INC) test/sort_map_test.c -o sort_map_test $(OBJ)
+	$(CC) $(CFLAGS) $(INC) $< -o $@ $(OBJ)
 
 sort_set_test: test/sort_set_test.c $(OBJ)
-	$(CC) $(CFLAGS) $(INC) test/sort_set_test.c -o sort_set_test $(OBJ)
+	$(CC) $(CFLAGS) $(INC) $< -o $@ $(OBJ)
 
 clean:
 	rm linked_list_test hash_map_test hash_set_test sort_map_test \

diff --git a/DataStructures/src/linked_list.c b/DataStructures/src/linked_list.c
@@ -20,8 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "linked_list.h"
-#include "memory.h"
+#include "../inc/linked_list.h"
+#include "../inc/memory.h"
 
 inline linked_list*
 new_linked_list(int value) {

diff --git a/DataStructures/src/sort_set.c b/DataStructures/src/sort_set.c
@@ -20,8 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "memory.h"
-#include "sort_set.h"
+#include "../inc/memory.h"
+#include "../inc/sort_set.h"
 
 inline sort_set*
 new_sort_set(int value) {
@@ -68,10 +68,10 @@ delete_sort_set(sort_set* set) {
   if (set == NULL || set->root == NULL) {
     return;
   }
-
+/*
   sort_set_node* node;
   sort_set_node* left;
   sort_set_node* right;
-
+*/
   DEALLOCATE(set);
 }
diff --git a/DataStructures/test/array_test.c b/DataStructures/test/array_test.c
@@ -17,7 +17,7 @@
  */
 
 #include "../../Testing/comparators.h"
-#include "../src/array.h"
+#include "../inc/array.h"
 
 int main(void) {
   START_TEST("array_test");

diff --git a/DataStructures/test/hash_map_test.c b/DataStructures/test/hash_map_test.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "../../Testing/comparators.h"
-#include "../src/hash_map.h"
+#include "../inc/hash_map.h"
 
 int main(void) {
   START_TEST("hash_map_test");

diff --git a/DataStructures/test/hash_set_test.c b/DataStructures/test/hash_set_test.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "../../Testing/comparators.h"
-#include "../src/hash_set.h"
+#include "../inc/hash_set.h"
 
 int main(void) {
   START_TEST("hash_set_test");

diff --git a/DataStructures/test/linked_list_test.c b/DataStructures/test/linked_list_test.c
@@ -17,7 +17,7 @@
  */
 
 #include "../../Testing/comparators.h"
-#include "../src/linked_list.h"
+#include "../inc/linked_list.h"
 
 int main(void) {
   START_TEST("linked_list_test");

diff --git a/DataStructures/test/sort_map_test.c b/DataStructures/test/sort_map_test.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "../../Testing/comparators.h"
-#include "../src/sort_map.h"
+#include "../inc/sort_map.h"
 
 int main(void) {
   START_TEST("sort_map_test");

diff --git a/DataStructures/test/sort_set_test.c b/DataStructures/test/sort_set_test.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 
 #include "../../Testing/comparators.h"
-#include "../src/sort_set.h"
+#include "../inc/sort_set.h"
 
 int main(void) {
   START_TEST("sort_set_test");

diff --git a/Testing/results.h b/Testing/results.h
@@ -19,7 +19,7 @@
 #ifndef RESULTS_H_
 #define RESULTS_H_
 
-#include "../DataStructures/src/memory.h"
+#include "../DataStructures/inc/memory.h"
 #include "../Terminal/outputstream.h"
 
 #ifdef __cplusplus