fix cparser warnings

[libfirm] / include / libfirm / adt / array.h

diff --git a/include/libfirm/adt/array.h b/include/libfirm/adt/array.h
index 7e610ec..642fc6c 100644 (file)
--- a/include/libfirm/adt/array.h
+++ b/include/libfirm/adt/array.h
@@ -47,7 +47,7 @@
  * @return A pointer to the flexible array (can be used as a pointer to the
  *         first element of this array).
  */
-#define NEW_ARR_F(type, nelts)                                         \
+#define NEW_ARR_F(type, nelts) \
   ((type *)ir_new_arr_f((nelts), sizeof(type) * (nelts)))
 
 /**
@@ -63,7 +63,7 @@
  * @return A pointer to the flexible array (can be used as a pointer to the
  *         first element of this array).
  */
-#define CLONE_ARR_F(type, arr)                 \
+#define CLONE_ARR_F(type, arr) \
   NEW_ARR_F(type, ARR_LEN((arr)))
 
 /**
@@ -78,7 +78,7 @@
  * @return A pointer to the flexible array (can be used as a pointer to the
  *         first element of this array).
  */
-#define DUP_ARR_F(type, arr)                                                   \
+#define DUP_ARR_F(type, arr) \
   ((type*) memcpy(CLONE_ARR_F(type, (arr)), (arr), sizeof(type) * ARR_LEN((arr))))
 
 /**
@@ -101,10 +101,10 @@
  * @return A pointer to the dynamic array (can be used as a pointer to the
  *         first element of this array).
  */
-#define NEW_ARR_D(type, obstack, nelts)                                        \
-  (  nelts                                                             \
-   ? (type *)ir_new_arr_d((obstack), (nelts), sizeof(type) * (nelts))  \
-   : (type *)arr_mt_descr.v.elts)
+#define NEW_ARR_D(type, obstack, nelts)                                 \
+  (  nelts                                                              \
+   ? (type *)ir_new_arr_d((obstack), (nelts), sizeof(type) * (nelts))   \
+   : (type *)arr_mt_descr.elts)
 
 /**
  * Creates a new dynamic array with the same number of elements as a
@@ -120,7 +120,7 @@
  * @return A pointer to the dynamic array (can be used as a pointer to the
  *         first element of this array).
  */
-#define CLONE_ARR_D(type, obstack, arr)                \
+#define CLONE_ARR_D(type, obstack, arr) \
   NEW_ARR_D(type, (obstack), ARR_LEN((arr)))
 
 /**
@@ -136,7 +136,7 @@
  * @return A pointer to the dynamic array (can be used as a pointer to the
  *         first element of this array).
  */
-#define DUP_ARR_D(type, obstack, arr)                                                  \
+#define DUP_ARR_D(type, obstack, arr) \
   ((type*)memcpy(CLONE_ARR_D(type, (obstack), (arr)), (arr), sizeof(type) * ARR_LEN ((arr))))
 
 /**
@@ -156,7 +156,7 @@
  *
  * @remark  This macro may change arr, so update all references!
  */
-#define ARR_RESIZE(type, arr, n)                                       \
+#define ARR_RESIZE(type, arr, n) \
   ((arr) = (type*) ir_arr_resize((void *)(arr), (n), sizeof(type)))
 
 /**
@@ -168,15 +168,9 @@
  *
  * @remark  This macro may change arr, so update all references!
  */
-#define ARR_SETLEN(type, arr, n)                                       \
+#define ARR_SETLEN(type, arr, n) \
   ((arr) = (type*) ir_arr_setlen((void *)(arr), (n), sizeof(type) * (n)))
 
-/** Set a length smaller than the current length of the array.  Do not
- *  resize. len must be <= ARR_LEN(arr). */
-#define ARR_SHRINKLEN(arr,len)                                          \
-   (ARR_VRFY((arr)), assert(ARR_DESCR((arr))->nelts >= len),             \
-    ARR_DESCR((arr))->nelts = len)
-
 /**
  * Resize a flexible array by growing it by delta elements.
  *
@@ -186,7 +180,7 @@
  *
  * @remark  This macro may change arr, so update all references!
  */
-#define ARR_EXTEND(type, arr, delta)                   \
+#define ARR_EXTEND(type, arr, delta) \
   ARR_RESIZE(type, (arr), ARR_LEN((arr)) + (delta))
 
 /**
@@ -199,7 +193,7 @@
  *
  * @remark  This macro may change arr, so update all references!
  */
-#define ARR_EXTO(type, arr, n)                                         \
+#define ARR_EXTO(type, arr, n) \
   ((n) >= ARR_LEN((arr)) ? ARR_RESIZE(type, (arr), (n)+1) : (arr))
 
 /**
@@ -209,7 +203,7 @@
  * @param arr      The array, which must be an lvalue.
  * @param elt      The new element, must be of type (type).
  */
-#define ARR_APP1(type, arr, elt)                                       \
+#define ARR_APP1(type, arr, elt) \
   (ARR_EXTEND(type, (arr), 1), (arr)[ARR_LEN((arr))-1] = (elt))
 
 #ifdef NDEBUG
@@ -217,7 +211,7 @@
 # define ARR_IDX_VRFY(arr, idx) ((void)0)
 #else
 # define ARR_VRFY(arr)          ir_verify_arr(arr)
-# define ARR_IDX_VRFY(arr, idx)                                \
+# define ARR_IDX_VRFY(arr, idx) \
     assert((0 <= (idx)) && ((idx) < ARR_LEN((arr))))
 #endif
 
@@ -228,28 +222,20 @@ typedef union {
   long l;
 } aligned_type;
 
-/**
- * Construct an array header.
- */
-#define ARR_STRUCT(type, rnelts)                    \
-  struct {                                          \
-       int magic;                                      \
-       size_t eltsize;                                 \
-    union {                                         \
-      struct obstack *obstack; /* dynamic: allocated on this obstack */  \
-      size_t allocated;                        /* flexible: #slots allocated */          \
-    } u;                                            \
-    size_t nelts;                                   \
-    union {                                         \
-      type elts[(rnelts)];                          \
-      aligned_type align[1];                        \
-    } v;                                            \
-  }
 
 /**
  * The array descriptor header type.
  */
-typedef ARR_STRUCT(aligned_type, 1) ir_arr_descr;
+typedef struct {
+       int magic;                    /**< array magic. */
+       size_t eltsize;               /**< size of array elements. */
+       union {
+               struct obstack *obstack;  /**< for obstack array: the obstack. */
+               size_t allocated;         /**< number of allocated elements. */
+       } u;
+       size_t nelts;                 /**< current length of the array. */
+       aligned_type elts[1];         /**< start of the array data. */
+} ir_arr_descr;
 
 extern ir_arr_descr arr_mt_descr;
 
@@ -260,9 +246,18 @@ FIRM_API void *ir_arr_resize(void *elts, size_t nelts, size_t elts_size);
 FIRM_API void *ir_arr_setlen(void *elts, size_t nelts, size_t elts_size);
 FIRM_API void ir_verify_arr(const void *elts);
 
-#define ARR_ELTS_OFFS offsetof(ir_arr_descr, v.elts)
+#define ARR_ELTS_OFFS offsetof(ir_arr_descr, elts)
 #define ARR_DESCR(elts) ((ir_arr_descr *)(void *)((char *)(elts) - ARR_ELTS_OFFS))
 
+/** Set a length smaller than the current length of the array.  Do not
+ *  resize. len must be <= ARR_LEN(arr). */
+static inline void ARR_SHRINKLEN(void *arr, size_t new_len)
+{
+       ARR_VRFY(arr);
+       assert(ARR_DESCR(arr)->nelts >= new_len);
+       ARR_DESCR(arr)->nelts = new_len;
+}
+
 #include "../end.h"
 
 #endif