From 7dce30ca733f6b310f997c4515e486718b273d44 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 15 Jan 2020 14:19:33 +0100 Subject: WIP: Checker base --- src/common/common.h | 20 +++++++++++--------- src/common/stack.c | 26 ++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 11 deletions(-) (limited to 'src/common') diff --git a/src/common/common.h b/src/common/common.h index 4225d87..18ccae3 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -14,15 +14,17 @@ typedef struct ** stack.c */ -t_stack *stack_new(int size); -void stack_destroy(t_stack *stack); -void stack_push(t_stack *stack, int n); -void stack_pop(t_stack *stack); -int stack_peek(t_stack *stack); -void stack_swap(t_stack *stack); -void stack_push_to(t_stack *from, t_stack *to); -void stack_rotate(t_stack *stack); -void stack_reverse_rotate(t_stack *stack); +t_stack *stack_new(int size); +void stack_destroy(t_stack *stack); +void stack_push(t_stack *stack, int n); +void stack_pop(t_stack *stack); +int stack_peek(t_stack *stack); +void stack_swap(t_stack *stack); +void stack_push_to(t_stack *from, t_stack *to); +void stack_rotate(t_stack *stack); +void stack_reverse_rotate(t_stack *stack); +t_bool stack_empty(t_stack *stack); +int stack_length(t_stack *stack); /* ** action.c diff --git a/src/common/stack.c b/src/common/stack.c index 693fb85..02d3207 100644 --- a/src/common/stack.c +++ b/src/common/stack.c @@ -11,7 +11,7 @@ t_stack *stack_new(int size) free(stack); return (NULL); } - stack->top = 0; + stack->top = -1; return (stack); } @@ -25,17 +25,21 @@ void stack_destroy(t_stack *stack) void stack_push(t_stack *stack, int n) { - stack->elements[stack->top] = n; stack->top++; + stack->elements[stack->top] = n; } void stack_pop(t_stack *stack) { + if (stack_empty(stack)) + return ; stack->top--; } int stack_peek(t_stack *stack) { + if (stack_empty(stack)) + return (0); return (stack->elements[stack->top]); } @@ -44,6 +48,8 @@ void stack_swap(t_stack *stack) int first; int second; + if (stack_length(stack) < 2) + return ; first = stack_peek(stack); stack_pop(stack); second = stack_peek(stack); @@ -56,6 +62,8 @@ void stack_push_to(t_stack *from, t_stack *to) { int tmp; + if (stack_empty(from)) + return ; tmp = stack_peek(from); stack_pop(from); stack_push(to, tmp); @@ -65,6 +73,8 @@ void stack_rotate(t_stack *stack) { int tmp; + if (stack_length(stack) < 2) + return ; tmp = stack_peek(stack); ft_memmove(&stack->elements[1], stack->elements, sizeof(int) * stack->top); stack->elements[0] = tmp; @@ -74,7 +84,19 @@ void stack_reverse_rotate(t_stack *stack) { int tmp; + if (stack_length(stack) < 2) + return ; tmp = stack->elements[0]; ft_memmove(stack->elements, &stack->elements[1], sizeof(int) * stack->top); stack_push(stack, tmp); } + +t_bool stack_empty(t_stack *stack) +{ + return (stack->top == -1); +} + +int stack_length(t_stack *stack) +{ + return (stack->top + 1); +} -- cgit