added the "scope" function

4 files changed, 45 insertions, 4 deletions

diff --git a/src/data/hash.c b/src/data/hash.c
index 3c01042..53a1b50 100644
--- a/src/data/hash.c
+++ b/src/data/hash.c
@@ -68,7 +68,7 @@ hash_insert_ht(Hash *p_hash, char *c_key, void *p_val, TYPE type) {
    if (p_hash->i_cur_size == p_hash->i_size)
       hash_size(p_hash, p_hash->i_size *2);
 
-   int i_addr = hash_getaddr(p_hash, c_key, free_ADDR);
+   int i_addr = hash_getaddr(p_hash, c_key, FREE_ADDR);
 
    if (i_addr == RET_ERROR )
       return (RET_NO_SPACE);
@@ -144,7 +144,7 @@ hash_getaddr(Hash *p_hash, char *c_key, HASH_OP OP) {
       i_addr = (i_addr *p_hash->i_size + (int) c_key[i]) % p_hash->i_size;
 
    switch (OP) {
-   case free_ADDR:
+   case FREE_ADDR:
       if (!hash_addrisfree(p_hash,i_addr))
          return (i_addr);
       break;
@@ -188,7 +188,7 @@ hash_nextaddr(Hash *p_hash, int i_max_tries, char *c_key, int i_addr,
    i_addr = (i_addr + 1) % p_hash->i_size;
 
    switch (OP) {
-   case free_ADDR:
+   case FREE_ADDR:
       if (!hash_addrisfree(p_hash,i_addr))
          return (i_addr);
       break;
@@ -289,3 +289,10 @@ hash_iterate(Hash *p_hash, void (*func)(void *)) {
       if (p_hash->p_elems[i].flag == 'o')
          (*func) (p_hash->p_elems[i].p_val);
 }
+
+void
+hash_iterate_key(Hash *p_hash, void (*func)(void *, char *)) {
+   for (int i = 0; i < p_hash->i_size; ++i)
+      if (p_hash->p_elems[i].flag == 'o')
+         (*func) (p_hash->p_elems[i].p_val, p_hash->p_elems[i].c_key);
+}
diff --git a/src/data/hash.h b/src/data/hash.h
index e49f3c3..9ee8640 100644
--- a/src/data/hash.h
+++ b/src/data/hash.h
@@ -39,7 +39,7 @@
 #include "types.h"
 
 typedef enum HASH_OP_ {
-   free_ADDR,
+   FREE_ADDR,
    OCC_ADDR
 } HASH_OP;
 
@@ -75,6 +75,7 @@ int hash_nextaddr(Hash *p_hash, int i_max_tries,
                   char *c_key, int i_addr,
                   HASH_OP OP);
 void hash_iterate(Hash *p_hash, void (*func)(void *));
+void hash_iterate_key(Hash *p_hash, void (*func)(void *, char *));
 
 #define hash_get_cur_size(hash) hash->i_cur_size
 #define hash_get_size(hash) hash->i_size
diff --git a/src/data/stack.c b/src/data/stack.c
index 5997c86..e7d5766 100644
--- a/src/data/stack.c
+++ b/src/data/stack.c
@@ -173,6 +173,35 @@ stack_iterate(Stack *p_stack, void (*func)(void *p_void)) {
    }
 }
 
+void
+stack_iterate2(Stack *p_stack, void (*func)(void *p_void, void *p_void2),
+               void *p_void_arg) {
+   if (!p_stack)
+      return;
+
+   StackElem *p_elem = p_stack->p_first;
+
+   while (p_elem) {
+      (*func)(p_elem->p_val, p_void_arg);
+      p_elem = p_elem->p_next;
+   }
+}
+
+void
+stack_iterate_level(Stack *p_stack, void (*func)(void *p_void,
+                    int i_level)) {
+   if (!p_stack)
+      return;
+
+   StackElem *p_elem = p_stack->p_first;
+
+   int i_level = 0;
+   while (p_elem) {
+      (*func)(p_elem->p_val, i_level++);
+      p_elem = p_elem->p_next;
+   }
+}
+
 StackIterator*
 stackiterator_new(Stack *p_stack) {
    StackIterator *p_iter = malloc(sizeof(StackIterator));
diff --git a/src/data/stack.h b/src/data/stack.h
index 88bde8d..45acdf8 100644
--- a/src/data/stack.h
+++ b/src/data/stack.h
@@ -59,6 +59,10 @@ 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_iterate2(Stack *p_stack, void (*func)(void *p_void, void *p_void2),
+                    void *p_void_arg);
+void stack_iterate_level(Stack *p_stack, void (*func)(void *p_void,
+                         int i_level));
 void stack_push(Stack *p_stack, void *p_val);
 void *stack_pop(Stack *p_stack);
 void stack_clear(Stack *p_stack);