gramppto99138/Info2DopleSpiel
1
0
Fork 0
generated from freudenreichan/info2Praktikum-DobleSpiel
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some things in stack.c, first test working

Browse Source
This commit is contained in:
Lukas Weber 2025-12-03 12:34:47 +01:00
parent 0bc9263b60
commit 036158fc59
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stack.c
View File

@ -12,12 +12,16 @@ StackNode *push(StackNode *stack, void *data)
{ {
if(!(stack)) { // check if stack is empty if(!(stack)) { // check if stack is empty
stack = malloc(sizeof(StackNode)); stack = malloc(sizeof(StackNode));
if(!stack)
return NULL;
stack->stackData = data; stack->stackData = data;
stack->below = NULL; stack->below = NULL;
return stack; return stack;
} }
StackNode* newStack = malloc(sizeof(StackNode)); StackNode* newStack = malloc(sizeof(StackNode));
if(!newStack)
return stack;
newStack->below = stack; newStack->below = stack;
newStack->stackData = data; newStack->stackData = data;
stack = newStack; stack = newStack;
@ -32,7 +36,6 @@ StackNode *pop(StackNode *stack)
if(stack) { if(stack) {
StackNode* temp = stack; StackNode* temp = stack;
stack = stack->below; stack = stack->below;
free(temp->data);
temp->stackData = NULL; temp->stackData = NULL;
free(temp); free(temp);
temp = NULL; temp = NULL;
@ -55,11 +58,7 @@ void *top(StackNode *stack)
// Clears stack and releases all memory. // Clears stack and releases all memory.
void clearStack(StackNode *stack) void clearStack(StackNode *stack)
{ {
if(stack) { while(stack)
do { stack = pop(stack);
stack = pop(stack);
} while (stack->below);
pop(stack);
}
} }

2
stack.h
View File

@ -10,7 +10,7 @@ The latest element is taken from the stack. */
//TODO: passenden Datentyp als struct anlegen //TODO: passenden Datentyp als struct anlegen
typedef struct StackNode { typedef struct StackNode {
StackNode* below; struct StackNode* below;
void* stackData; void* stackData;
} StackNode; } StackNode;

16
test_stack.c
View File

@ -3,18 +3,28 @@
void test_firstNodeAddedCorrectly(void) { void test_firstNodeAddedCorrectly(void) {
StackNode* modelStack; printf("\nStarting first test...\n");
StackNode* modelStack = malloc(sizeof(StackNode));
int modelData = 5; int modelData = 5;
modelStack->below = NULL; modelStack->below = NULL;
modelStack->data = &modelData; modelStack->stackData = &modelData;
StackNode* testStack = NULL; StackNode* testStack = NULL;
int testData = 5; int testData = 5;
testStack = push(testStack, &testData); testStack = push(testStack, &testData);
TEST_ASSERT_EQUAL_INT(*(modelStack->data), *(testStack->data)); TEST_ASSERT_EQUAL_INT(*(int*)modelStack->stackData, *(int*)testStack->stackData);
TEST_ASSERT_NULL(testStack->below); TEST_ASSERT_NULL(testStack->below);
clearStack(modelStack);
clearStack(testStack);
} }
void setUp(void) {
}
void tearDown(void) {
}
int main(void) { int main(void) {