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

.vscode/c_cpp_properties.json

@@ -0,0 +1,18 @@
+{
+  "configurations": [
+    {
+      "name": "windows-gcc-x64",
+      "includePath": [
+        "${workspaceFolder}/**"
+      ],
+      "compilerPath": "C:/ProgramData/mingw64/mingw64/bin/gcc.exe",
+      "cStandard": "${default}",
+      "cppStandard": "${default}",
+      "intelliSenseMode": "windows-gcc-x64",
+      "compilerArgs": [
+        ""
+      ]
+    }
+  ],
+  "version": 4
+}

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "C/C++ Runner: Debug Session",
+      "type": "cppdbg",
+      "request": "launch",
+      "args": [],
+      "stopAtEntry": false,
+      "externalConsole": true,
+      "cwd": "c:/Users/Max-R/I2Pr/info2Praktikum-DobleSpiel",
+      "program": "c:/Users/Max-R/I2Pr/info2Praktikum-DobleSpiel/build/Debug/outDebug",
+      "MIMode": "gdb",
+      "miDebuggerPath": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        }
+      ]
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,59 @@
+{
+  "C_Cpp_Runner.cCompilerPath": "gcc",
+  "C_Cpp_Runner.cppCompilerPath": "g++",
+  "C_Cpp_Runner.debuggerPath": "gdb",
+  "C_Cpp_Runner.cStandard": "",
+  "C_Cpp_Runner.cppStandard": "",
+  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
+  "C_Cpp_Runner.useMsvc": false,
+  "C_Cpp_Runner.warnings": [
+    "-Wall",
+    "-Wextra",
+    "-Wpedantic",
+    "-Wshadow",
+    "-Wformat=2",
+    "-Wcast-align",
+    "-Wconversion",
+    "-Wsign-conversion",
+    "-Wnull-dereference"
+  ],
+  "C_Cpp_Runner.msvcWarnings": [
+    "/W4",
+    "/permissive-",
+    "/w14242",
+    "/w14287",
+    "/w14296",
+    "/w14311",
+    "/w14826",
+    "/w44062",
+    "/w44242",
+    "/w14905",
+    "/w14906",
+    "/w14263",
+    "/w44265",
+    "/w14928"
+  ],
+  "C_Cpp_Runner.enableWarnings": true,
+  "C_Cpp_Runner.warningsAsError": false,
+  "C_Cpp_Runner.compilerArgs": [],
+  "C_Cpp_Runner.linkerArgs": [],
+  "C_Cpp_Runner.includePaths": [],
+  "C_Cpp_Runner.includeSearch": [
+    "*",
+    "**/*"
+  ],
+  "C_Cpp_Runner.excludeSearch": [
+    "**/build",
+    "**/build/**",
+    "**/.*",
+    "**/.*/**",
+    "**/.vscode",
+    "**/.vscode/**"
+  ],
+  "C_Cpp_Runner.useAddressSanitizer": false,
+  "C_Cpp_Runner.useUndefinedSanitizer": false,
+  "C_Cpp_Runner.useLeakSanitizer": false,
+  "C_Cpp_Runner.showCompilationTime": false,
+  "C_Cpp_Runner.useLinkTimeOptimization": false,
+  "C_Cpp_Runner.msvcSecureNoWarnings": false
+}

makefile

@@ -1,5 +1,6 @@
 CC = gcc
 FLAGS = -g -Wall -lm
+ASAN_FLAGS = -fsanitize=address 
 
 ifeq ($(OS),Windows_NT)
 	include makefile_windows.variables
@@ -35,11 +36,11 @@ $(program_obj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-
+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
@@ -51,5 +52,5 @@ clean:
 ifeq ($(OS),Windows_NT)
 	rm -f *.o doble
 else
-	del /f *.o doble
+	rm -f *.o doble
 endif

stack.c

@@ -10,73 +10,76 @@
 } StackNode;*/
 
 // TODO: grundlegende Stackfunktionen implementieren:
-/* `push`: legt ein Element oben auf den Stack,
+/*  * `push`: legt ein Element oben auf den Stack,
  * `pop`: entfernt das oberste Element,
  * `top`: liefert das oberste Element zurück,
  * `clearStack`: gibt den gesamten Speicher frei. */
 
-// [A] -> [B] -> [C] -> NULL
+StackNode *createNode(void *data)
-// head -> stack.next
+{
 
-StackNode *createNode(void *data) {
+    StackNode *node =
+        malloc(sizeof(StackNode)); // Speicher reservieren, Speicherplatz für das
+                                   // struct StackNode
 
-  StackNode *node =
+    if (node == NULL)
-      malloc(sizeof(StackNode)); // Speicher reservieren, Speicherplatz für das
+        return NULL; // Speicher konnte nicht reserviert werden
-                                 // struct StackNode
 
-  if (node == NULL)
+    node->data = data; // Zeiger auf data neuer node
-    return NULL; // Speicher konnte nicht reserviert werden
+    node->next = NULL; // nächster Zeiger ist NULL, Ende der Liste
 
-  node->data = data; // Zeiger auf data neuer node
+    return node; // pointer auf den neuen Knoten zurückgeben
-  node->next = NULL; // nächster Zeiger ist NULL, Ende der Liste
-
-  return node; // pointer auf den neuen Knoten zurückgeben
 }
 
 // Pushes data as pointer onto the stack.
-StackNode *push(StackNode *stack, void *data) {
+StackNode *push(StackNode *stack, void *data)
+{
+    StackNode *newNode = createNode(data); // Speicher für neuen Knoten
+                                           // reservieren
 
-  StackNode *newNode = createNode(data); // Speicher für neuen Knoten
+    if (newNode == NULL)
-                                         // reservieren
+    { // wenn Speicher nicht reserviert werden konnte, wird
+        // stack unverändert zurückgegeben
+        return stack;
+    }
 
-  if (newNode == NULL) { // wenn Speicher nicht reserviert werden konnte, wird
+    newNode->next = stack; // pointer verschieben
-                         // stack unverändert zurückgegeben
-    return stack;
-  }
 
-  newNode->next = stack; // pointer verschieben
+    return newNode; // Zeiger auf neuen Speicherbereich zurückgeben
-
-  return newNode; // Zeiger auf neuen Speicherbereich zurückgeben
 }
 
-// Deletes the top element of the stack (latest added element) and releases its
+// Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
-// memory. (Pointer to data has to be freed by caller.)
+// freed by caller.)
-StackNode *pop(StackNode *stack) {
+StackNode *pop(StackNode *stack)
+{
+    if (stack == NULL)
+        return NULL;
 
-  if (stack == NULL)
+    StackNode *nextNode = stack->next;
-    return NULL;
 
-  StackNode *nextNode = stack->next;
+    free(stack);
 
-  free(stack);
+    stack = NULL;
 
-  stack = NULL;
+    return nextNode;
-
-  return nextNode;
 }
 
 // Returns the data of the top element.
 void *top(StackNode *stack) { return stack != NULL ? stack->data : NULL; }
 
 // Clears stack and releases all memory.
-StackNode *clearStack(StackNode *stack) {
+void clearStack(StackNode **stack)
+{
+    while (*stack != NULL)
+    {
 
-  while (stack != NULL) {
+        StackNode *next = (*stack)->next;
+        free(*stack);
+        (*stack)->data = NULL;
+        (*stack)->next = NULL;
+        (*stack)->prev = NULL;
+        (*stack) = next;
 
-    StackNode *next = stack->next;
+    }
-    free(stack);
+    
-    stack = next;
-  }
-
-  return NULL;
 }

stack.h

@@ -13,6 +13,17 @@ typedef struct StackNode {
 
   void *data;
   struct StackNode *next;
+  struct StackNode *prev;
+
+} StackNode;
+
+StackNode *createNode(void *data);
+
+typedef struct StackNode {
+
+  void *data;
+  struct StackNode *next;
+  struct StackNode *prev;
 
 } StackNode;
 
@@ -29,6 +40,6 @@ StackNode *pop(StackNode *stack);
 void *top(StackNode *stack);
 
 // Clears stack and releases all memory.
-StackNode *clearStack(StackNode *stack);
+void clearStack(StackNode **stack);
 
 #endif

test_stack.c

@@ -35,8 +35,9 @@ void test_clearStack(void) {
 
     testStack = push(testStack, &testInts[i]);
   }
+  //printf("testints: %d,%d,%d,%d,%d",testInts[0],testInts[1],testInts[2],testInts[3],testInts[4]);
 
-  testStack = clearStack(testStack);
+  clearStack(&testStack);
   TEST_ASSERT_NULL(testStack);
 }