Merge remote-tracking branch 'origin/tobi_experimental' into RMax

.gitignore

@@ -1 +1,3 @@
-highscores.txt
+doble_initial.exe
+*.o
+*.exe

highscores.txt

@@ -1,9 +1,2 @@
-Max02.12;19860
+krisp;4986
-max;19374
-Max02.12;11910
-kristin;9935
-Max02.12;7966
-player_name;7961
-max;5989
-Max02.12;4988
 player1;3999

makefile

@@ -1,5 +1,6 @@
 CC = gcc
 FLAGS = -g -Wall -lm
+ASAN_FLAGS = -fsanitize=address 
 
 ifeq ($(OS),Windows_NT)
 	include makefile_windows.variables
@@ -29,7 +30,7 @@ program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o
 doble : main.o $(program_obj_files)
 	$(CC) $(FLAGS) $^ -o doble
 
-$(program_obj_filesobj_files): %.o: %.c
+$(program_obj_files): %.o: %.c
 	$(CC) -c $(FLAGS) $^ -o $@
 
 # --------------------------
@@ -39,7 +40,7 @@ unitTests:
 TEST_BIN = runTests
 
 unitTests: stack.o test_stack.o
-	$(CC) $(FLAGS) -I$(unityfolder) -o $(TEST_BIN) stack.o test_stack.o $(unityfolder)/unity.c
+	$(CC) $(FLAGS) $(ASAN_FLAGS) -I$(unityfolder) -o $(TEST_BIN) stack.o test_stack.o $(unityfolder)/unity.c
 
 test_stack.o: test_stack.c
 	$(CC) $(FLAGS) -I$(unityfolder) -c test_stack.c -o test_stack.o
@@ -49,7 +50,7 @@ test_stack.o: test_stack.c
 # --------------------------
 clean:
 ifeq ($(OS),Windows_NT)
-	del /f *.o doble
+	rm -f *.o doble
 else
 	rm -f *.o doble
 endif

stack.c

@@ -1,5 +1,13 @@
-#include <stdlib.h>
 #include "stack.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+/*typedef struct {
+
+  void *data;
+  struct StackNode *next;
+
+} StackNode;*/
 
 // TODO: grundlegende Stackfunktionen implementieren:
 /*  * `push`: legt ein Element oben auf den Stack,
@@ -60,17 +68,18 @@ StackNode *pop(StackNode *stack)
 void *top(StackNode *stack) { return stack != NULL ? stack->data : NULL; }
 
 // Clears stack and releases all memory.
-void clearStack(StackNode *stack)
+void clearStack(StackNode **stack)
 {
-    while (stack != NULL)
+    while (*stack != NULL)
     {
 
-        StackNode *next = (stack)->next;
+        StackNode *next = (*stack)->next;
-        free(stack);
+        free(*stack);
-        stack = next;
+        (*stack)->data = NULL;
-        (stack)->data = NULL;
+        (*stack)->next = NULL;
-        (stack)->next = NULL;
+        (*stack)->prev = NULL;
-        (stack)->prev = NULL;
+        (*stack) = next;
+
     }
     
 }

stack.h

@@ -1,13 +1,23 @@
 #ifndef STACK_H
 #define STACK_H
 
-/* A stack is a special type of queue which uses the LIFO (last in, first out) principle. 
+/* A stack is a special type of queue which uses the LIFO (last in, first out)
-This means that with each new element all other elements are pushed deeper into the stack. 
+principle. This means that with each new element all other elements are pushed
-The latest element is taken from the stack. */
+deeper into the stack. The latest element is taken from the stack. */
 
 #include <stdlib.h>
 
-//TODO: passenden Datentyp als struct anlegen
+// TODO: passenden Datentyp als struct anlegen
+
+typedef struct StackNode {
+
+  void *data;
+  struct StackNode *next;
+  struct StackNode *prev;
+
+} StackNode;
+
+StackNode *createNode(void *data);
 
 typedef struct StackNode {
 
@@ -22,14 +32,14 @@ StackNode *createNode(void *data);
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data);
 
-// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
+// Deletes the top element of the stack (latest added element) and releases its
-// freed by caller.)
+// memory. (Pointer to data has to be freed by caller.)
 StackNode *pop(StackNode *stack);
 
 // Returns the data of the top element.
 void *top(StackNode *stack);
 
 // Clears stack and releases all memory.
-void clearStack(StackNode *stack);
+void clearStack(StackNode **stack);
 
 #endif

test_stack.c

@@ -37,7 +37,7 @@ void test_clearStack(void) {
   }
   //printf("testints: %d,%d,%d,%d,%d",testInts[0],testInts[1],testInts[2],testInts[3],testInts[4]);
 
-  clearStack(testStack);
+  clearStack(&testStack);
   TEST_ASSERT_NULL(testStack);
 }
 
@@ -57,4 +57,4 @@ int main(void) {
   RUN_TEST(test_clearStack);
 
   return UNITY_END();
-}
+}