Use foreach_pset().

[libfirm] / ir / adt / array.c

diff --git a/ir/adt/array.c b/ir/adt/array.c
index 675239f..d84007e 100644 (file)
--- a/ir/adt/array.c
+++ b/ir/adt/array.c
@@ -21,7 +21,6 @@
  * @file
  * @brief       Array --- dynamic & flexible arrays.
  * @author      Markus Armbruster
- * @version     $Id$
  */
 
 #include "config.h"
@@ -47,7 +46,7 @@
 /**
  * An empty dynamic array descriptor.
  */
-ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, {0}, 0, {{{0}}} };
+ir_arr_descr arr_mt_descr = { ARR_D_MAGIC, 0, { 0 }, 0,  { { 0 } } };
 
 void ir_verify_arr(const void *arr)
 {
@@ -55,10 +54,7 @@ void ir_verify_arr(const void *arr)
        ir_arr_descr *descr = ARR_DESCR(arr);
        assert(descr->magic == ARR_D_MAGIC || descr->magic == ARR_A_MAGIC
                         || descr->magic == ARR_F_MAGIC);
-       if (descr->magic == ARR_F_MAGIC) {
-               assert(descr->u.allocated >= descr->nelts);
-       }
-       assert(descr->nelts >= 0);
+       assert(descr->magic != ARR_F_MAGIC || descr->u.allocated >= descr->nelts);
 #else
        (void) arr;
 #endif
@@ -86,7 +82,7 @@ void *ir_new_arr_d(struct obstack *obstack, size_t nelts, size_t elts_size)
        ARR_SET_DBGINF(dp, ARR_D_MAGIC, elts_size/nelts);
        dp->u.obstack = obstack;
        dp->nelts = nelts;
-       return dp->v.elts;
+       return dp->elts;
 }
 
 /**
@@ -107,7 +103,7 @@ void *ir_new_arr_f(size_t nelts, size_t elts_size)
        newa = (ir_arr_descr*)xmalloc(ARR_ELTS_OFFS+elts_size);
        ARR_SET_DBGINF(newa, ARR_F_MAGIC, nelts ? elts_size/nelts : 0);
        newa->u.allocated = newa->nelts = nelts;
-       return newa->v.elts;
+       return newa->elts;
 }
 
 /**
@@ -153,7 +149,7 @@ void *ir_arr_setlen (void *elts, size_t nelts, size_t elts_size)
        dp = (ir_arr_descr*) xrealloc(dp, ARR_ELTS_OFFS+elts_size);
        dp->u.allocated = dp->nelts = nelts;
 
-       return dp->v.elts;
+       return dp->elts;
 }
 
 /**
@@ -190,10 +186,14 @@ void *ir_arr_resize(void *elts, size_t nelts, size_t eltsize)
        }
        dp->nelts = nelts;
 
-       return dp->v.elts;
+       return dp->elts;
 }
 
 #ifdef DEBUG_libfirm
+/* forward declarations to avoid warnings */
+size_t array_len(const void *arr);
+ir_arr_descr *array_descr(const void *arr);
+
 /**
  * This function returns the length of a flexible array.
  * Do NOT use is in code, use ARR_LEN() macro!