backdowngrade

5 files changed, 19 insertions, 57 deletions

diff --git a/src/data/array.c b/src/data/array.c
index da5bee8..2ae4ece 100644
--- a/src/data/array.c
+++ b/src/data/array.c
@@ -41,7 +41,7 @@ array_new() {
    p_array->i_size = 0;
    p_array->pp_ae = NULL;
 
-   return (p_array);
+   return p_array;
 }
 
 
@@ -92,7 +92,7 @@ array_insert(Array *p_array, int i_index, void *p_val) {
 void*
 array_remove(Array *p_array, int i_index) {
    if (p_array->i_size <= i_index)
-      return (NULL);
+      return NULL;
 
    ArrayElement *p_ae = p_array->pp_ae[i_index];
    void *p_ret = p_ae->p_val;
@@ -105,7 +105,7 @@ array_remove(Array *p_array, int i_index) {
 
    array_resize(p_array, p_array->i_size - 1);
 
-   return (p_ret);
+   return p_ret;
 }
 
 void
@@ -147,17 +147,17 @@ array_resize(Array *p_array, int i_size) {
 void*
 array_get(Array *p_array, int i_index) {
    if (p_array->i_size > i_index)
-      return (p_array->pp_ae[i_index]->p_val);
+      return p_array->pp_ae[i_index]->p_val;
 
-   return (NULL);
+   return NULL;
 }
 
 _Bool
 array_defined(Array *p_array, int i_index) {
    if (i_index >= p_array->i_size)
-      return (false);
+      return false;
 
-   return (p_array->pp_ae[i_index]->p_val != NULL);
+   return p_array->pp_ae[i_index]->p_val != NULL;
 }
 
 void
@@ -222,7 +222,7 @@ arrayelement_new(void *p_val) {
 
    p_ae->p_val = p_val;
 
-   return (p_ae);
+   return p_ae;
 }
 
 void
@@ -235,27 +235,14 @@ arrayelement_delete(ArrayElement *p_ae) {
 
 ArrayIterator*
 arrayiterator_new(Array *p_array) {
-   if (p_array == NULL)
-      return (NULL);
+   if (!p_array)
+      return NULL;
 
    ArrayIterator *p_arrayiterator = malloc(sizeof(ArrayIterator));
    p_arrayiterator->p_array = p_array;
    p_arrayiterator->i_cur_pos = 0;
-   p_arrayiterator->b_is_reverse = false;
-
-   return (p_arrayiterator);
-}
-
-ArrayIterator*
-arrayiterator_new_reverse(Array *p_array) {
-   ArrayIterator *p_arrayiterator = arrayiterator_new(p_array);
-   if (p_arrayiterator == NULL)
-      return (NULL);
-
-   p_arrayiterator->b_is_reverse = true;
-   p_arrayiterator->i_cur_pos = p_array->i_size;
 
-   return (p_arrayiterator);
+   return p_arrayiterator;
 }
 
 void
@@ -266,21 +253,14 @@ arrayiterator_delete(ArrayIterator *p_arrayiterator) {
 
 _Bool
 arrayiterator_has_next(ArrayIterator *p_arrayiterator) {
-   if (p_arrayiterator->b_is_reverse)
-      return (p_arrayiterator->i_cur_pos >= 0);
-
-   return (p_arrayiterator->i_cur_pos <
-           array_get_size(p_arrayiterator->p_array));
+   return p_arrayiterator->i_cur_pos <
+          array_get_size(p_arrayiterator->p_array);
 }
 
 void*
 arrayiterator_next(ArrayIterator *p_arrayiterator) {
    if (!arrayiterator_has_next(p_arrayiterator))
-      return (NULL);
-
-   if (p_arrayiterator->b_is_reverse)
-      return (array_get(p_arrayiterator->p_array,
-                        p_arrayiterator->i_cur_pos--));
+      return NULL;
 
-   return (array_get(p_arrayiterator->p_array, p_arrayiterator->i_cur_pos++));
+   return array_get(p_arrayiterator->p_array, p_arrayiterator->i_cur_pos++);
 }
diff --git a/src/data/array.h b/src/data/array.h
index 6170c29..b343521 100644
--- a/src/data/array.h
+++ b/src/data/array.h
@@ -58,7 +58,6 @@ typedef struct {
 typedef struct {
    Array *p_array;
    int i_cur_pos;
-   _Bool b_is_reverse;
 } ArrayIterator;
 
 Array *array_new();
@@ -81,7 +80,6 @@ ArrayElement *arrayelement_new(void *p_val);
 void arrayelement_delete(ArrayElement *p_ae);
 
 ArrayIterator *arrayiterator_new(Array *p_array);
-ArrayIterator *arrayiterator_new_reverse(Array *p_array);
 void arrayiterator_delete(ArrayIterator *p_arrayiterator);
 _Bool arrayiterator_has_next(ArrayIterator *p_arrayiterator);
 void *arrayiterator_next(ArrayIterator *p_arrayiterator);
diff --git a/src/data/hash.c b/src/data/hash.c
index d3f7634..5555eb1 100644
--- a/src/data/hash.c
+++ b/src/data/hash.c
@@ -44,13 +44,13 @@ hash_new(unsigned i_size) {
 
    p_hash->i_size = i_size;
    p_hash->i_cur_size = 0;
-   p_hash->p_elems = (HashElem *) calloc((int)i_size, sizeof(HashElem));
+   p_hash->p_elems = (HashElem *) calloc(i_size, sizeof(HashElem));
 
    /*Set all positions as "free" */
    for (int i = 0; i < i_size; ++i)
       p_hash->p_elems[i].flag = 'f';
 
-   return (p_hash);
+   return p_hash;
 }
 
 void
diff --git a/src/data/stack.c b/src/data/stack.c
index 0f5f58e..9afb9b4 100644
--- a/src/data/stack.c
+++ b/src/data/stack.c
@@ -62,8 +62,7 @@ stack_empty(Stack *p_stack) {
 }
 
 void
-stack_debug(Stack *p_stack, void *p_val) {
-   printf("bPUSH %d %d\n", stack_size(p_stack), (int)p_stack);
+stack_push(Stack *p_stack, void *p_val) {
    StackElem *p_elem = stackelem_new();
 
    p_elem->p_val = p_val;
@@ -74,20 +73,6 @@ stack_debug(Stack *p_stack, void *p_val) {
       p_stack->p_last = p_stack->p_first;
 
    ++p_stack->i_size;
-   printf("aPUSH %d %d\n", stack_size(p_stack), (int)p_stack);
-}
-
-unsigned
-stack_push(Stack *p_stack, void *p_val) {
-   StackElem *p_elem = stackelem_new();
-   p_elem->p_val = p_val;
-   p_elem->p_next = p_stack->p_first;
-   p_stack->p_first = p_elem;
-
-   if (p_stack->p_last == NULL)
-      p_stack->p_last = p_stack->p_first;
-
-   return (++p_stack->i_size);
 }
 
 void*
diff --git a/src/data/stack.h b/src/data/stack.h
index e9fafea..4774cef 100644
--- a/src/data/stack.h
+++ b/src/data/stack.h
@@ -59,8 +59,7 @@ Stack *stack_new();
 StackElem *stackelem_new();
 _Bool stack_empty(Stack *p_stack);
 void stack_iterate(Stack *p_stack, void (*func)(void *p_void));
-unsigned stack_push(Stack *p_stack, void *p_val);
-void stack_debug(Stack *p_stack, void *p_val);
+void stack_push(Stack *p_stack, void *p_val);
 void *stack_pop(Stack *p_stack);
 void stack_clear(Stack *p_stack);
 void stack_delete(Stack *p_stack);