run astyle

still lots of debugging to do.

8 files changed, 28 insertions, 29 deletions

diff --git a/src/build.h b/src/build.h
index df9738e..cb7e720 100644
--- a/src/build.h
+++ b/src/build.h
@@ -35,7 +35,7 @@
 #ifndef BUILD_H
 #define BUILD_H
 
-#define BUILDNR 9607
+#define BUILDNR 9654
 #define OS_FREEBSD
 
 #endif
diff --git a/src/core/interpret.c b/src/core/interpret.c
index a53f193..86d5a36 100644
--- a/src/core/interpret.c
+++ b/src/core/interpret.c
@@ -104,7 +104,7 @@ interpret_new(List *p_list_token, Hash *p_hash_syms) {
 
 void
 interpret_delete(Interpret *p_interpret) {
-   if (!p_interpret)
+   if (p_interpret == NULL)
       return;
 
    if (p_interpret->b_scope_delete)
@@ -523,16 +523,16 @@ _control(Interpret *p_interpret) {
          switch (tt) {
          case TT_IF:
             if (convert_to_integer_get(p_token_top)) {
-               scope_up(p_interpret->p_scope);
+               //scope_up(p_interpret->p_scope);
                ret = interpret_subprocess(p_interpret, p_list_block);
-               scope_down(p_interpret->p_scope);
+               //scope_down(p_interpret->p_scope);
             }
             break;
          case TT_IFNOT:
             if (!convert_to_integer_get(p_token_top)) {
-               scope_up(p_interpret->p_scope);
+               //scope_up(p_interpret->p_scope);
                ret = interpret_subprocess(p_interpret, p_list_block);
-               scope_down(p_interpret->p_scope);
+               //scope_down(p_interpret->p_scope);
             }
             break;
             NO_DEFAULT;
diff --git a/src/core/scope.c b/src/core/scope.c
index 1eaac8f..ecf5933 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -61,41 +61,41 @@ scope_delete(Scope *p_scope) {
 
 void
 scope_up(Scope *p_scope) {
-#ifdef EXTRA_CHECKS 
+#ifdef EXTRA_CHECKS
    int i_before = (int) stack_size(p_scope->p_stack_scopes);
 #elif DEBUG_SCOPE_UPDOWN
    int i_before = (int) stack_size(p_scope->p_stack_scopes);
 #endif
    stack_push(p_scope->p_stack_scopes, hash_new(24));
 #ifdef DEBUG_SCOPE_UPDOWN
-   printf("SCOPE UPPED %d => %d\n", 
-		   i_before,
-		   (int) stack_size(p_scope->p_stack_scopes));
+   printf("SCOPE UPPED %d => %d\n",
+          i_before,
+          (int) stack_size(p_scope->p_stack_scopes));
 #endif /* DEBUG_SCOPE_UPDOWN */
 #ifdef EXTRA_CHECKS
    if (i_before >= (int) stack_size(p_scope->p_stack_scopes))
-	   _SCOPE_ERROR("Scope should be higher");
+      _SCOPE_ERROR("Scope should be higher");
 #endif /* EXTRA_CHECKS */
 }
 
 void
 scope_down(Scope *p_scope) {
-#ifdef EXTRA_CHECKS 
+#ifdef EXTRA_CHECKS
    int i_before = (int) stack_size(p_scope->p_stack_scopes);
 #elif DEBUG_SCOPE_UPDOWN
    int i_before = (int) stack_size(p_scope->p_stack_scopes);
-#endif 
+#endif
    Hash *p_hash_syms = stack_pop(p_scope->p_stack_scopes);
    hash_iterate(p_hash_syms, symbol_cleanup_hash_syms_cb);
    hash_delete(p_hash_syms);
 #ifdef DEBUG_SCOPE_UPDOWN
-   printf("SCOPE DOWNED %d => %d\n", 
-		   i_before,
-		   (int) stack_size(p_scope->p_stack_scopes));
+   printf("SCOPE DOWNED %d => %d\n",
+          i_before,
+          (int) stack_size(p_scope->p_stack_scopes));
 #endif /* DEBUG_SCOPE_UPDOWN */
 #ifdef EXTRA_CHECKS
    if (i_before <= (int) stack_size(p_scope->p_stack_scopes))
-	   _SCOPE_ERROR("Scope should be lower");
+      _SCOPE_ERROR("Scope should be lower");
 #endif /* EXTRA_CHECKS */
 }
 
diff --git a/src/core/token.c b/src/core/token.c
index 9162c4d..4bed0e0 100644
--- a/src/core/token.c
+++ b/src/core/token.c
@@ -396,10 +396,10 @@ token_delete(Token *p_token) {
 
       _token_free(p_token);
 
-   } 
+   }
 #ifdef DEBUG_TOKEN_REFCOUNT
-    else if (p_token->i_ref_count < 0) {
-		token_print_ln(p_token);
+   else if (p_token->i_ref_count < 0) {
+      token_print_ln(p_token);
       printf("Token ref count is 0 > %d\n",
              p_token->i_ref_count);
    }
diff --git a/src/data/hash.c b/src/data/hash.c
index 5555eb1..d3f7634 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(i_size, sizeof(HashElem));
+   p_hash->p_elems = (HashElem *) calloc((int)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 778e41e..0f5f58e 100644
--- a/src/data/stack.c
+++ b/src/data/stack.c
@@ -63,7 +63,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);
+   printf("bPUSH %d %d\n", stack_size(p_stack), (int)p_stack);
    StackElem *p_elem = stackelem_new();
 
    p_elem->p_val = p_val;
@@ -74,13 +74,12 @@ 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);
+   printf("aPUSH %d %d\n", stack_size(p_stack), (int)p_stack);
 }
 
-void
+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;
@@ -88,7 +87,7 @@ stack_push(Stack *p_stack, void *p_val) {
    if (p_stack->p_last == NULL)
       p_stack->p_last = p_stack->p_first;
 
-   ++p_stack->i_size;
+   return (++p_stack->i_size);
 }
 
 void*
diff --git a/src/data/stack.h b/src/data/stack.h
index 721ed31..e9fafea 100644
--- a/src/data/stack.h
+++ b/src/data/stack.h
@@ -59,7 +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));
-void stack_push(Stack *p_stack, void *p_val);
+unsigned stack_push(Stack *p_stack, void *p_val);
 void stack_debug(Stack *p_stack, void *p_val);
 void *stack_pop(Stack *p_stack);
 void stack_clear(Stack *p_stack);
diff --git a/src/defines.h b/src/defines.h
index 9842c4f..29df2c2 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -79,7 +79,7 @@
 #define DEBUG_SCOPE_UPDOWN
 //#define DEBUG_TOKEN_REFCOUNT
 //#define DEBUG_FUNCTION_PROCESS
-//#define DEBUG_TRACK
+#define DEBUG_TRACK
 //#define DEBUG_BLOCK_GET
 //#define DEBUG_EXPRESSION_GET
 //#define DEBUG_ARRAY_GET