Fix tabbing

[satune.git] / src / Collections / vector.h

diff --git a/src/Collections/vector.h b/src/Collections/vector.h
index d131a275d46eae38d9f26664b32d7511d11a09d3..c069e9460da533ef03c773c2de7b2b87a4ba3d02 100644 (file)
--- a/src/Collections/vector.h
+++ b/src/Collections/vector.h
@@ -2,60 +2,64 @@
 #define VECTOR_H
 #include <string.h>
 
-#define VectorDef(name, type, defcap)                                                                                                                                          \
-       struct Vector ## name {                                                                                                                                                                                         \
-               uint size;                                                                                                                                                                                                                                      \
-               uint capacity;                                                                                                                                                                                                                  \
-               type * array;                                                                                                                                                                                                                           \
-       };                                                                                                                                                                                                                                                                              \
-       typedef struct Vector ## name Vector ## name;                                                                                                   \
-       Vector ## name * allocVector ## name(uint capacity);                                                                    \
-       Vector ## name * allocDefVector ## name();                                                                                                              \
+#define VectorDef(name, type, defcap)                                   \
+       struct Vector ## name {                                               \
+               uint size;                                                          \
+               uint capacity;                                                      \
+               type * array;                                                       \
+       };                                                                    \
+       typedef struct Vector ## name Vector ## name;                         \
+       Vector ## name * allocVector ## name(uint capacity);                  \
+       Vector ## name * allocDefVector ## name();                            \
        Vector ## name * allocVectorArray ## name(uint capacity, type * array); \
-       void pushVector ## name(Vector ## name *vector, type item);                                             \
-       type getVector ## name(Vector ## name *vector, uint index);                                             \
+       void pushVector ## name(Vector ## name *vector, type item);           \
+       type getVector ## name(Vector ## name *vector, uint index);           \
        void setVector ## name(Vector ## name *vector, uint index, type item); \
-       uint getSizeVector ##name(Vector ##name *vector);                                                                                       \
-       void deleteVector ##name(Vector ##name *vector);                                                                                                \
-       void clearVector ##name(Vector ## name *vector);
+       uint getSizeVector ## name(Vector ## name *vector);                   \
+       void deleteVector ## name(Vector ## name *vector);                    \
+       void clearVector ## name(Vector ## name *vector);                     \
+       type * exposeArray ## name(Vector ## name * vector);
 
-#define VectorImpl(name, type, defcap)                                                                                                                                 \
-       Vector ## name * allocDefVector ## name() {                                                                                                             \
-               return allocVector ## name(defcap);                                                                                                                                     \
-       }                                                                                                                                                                                                                                                                                       \
-       Vector ## name * allocVector ## name(uint capacity)     {                                                                       \
-               Vector ## name * tmp = (Vector ## name *) ourmalloc(sizeof(type));      \
-               tmp->size = 0;                                                                                                                                                                                                                  \
-               tmp->capacity = capacity;                                                                                                                                                                               \
-               tmp->array = (type *) ourcalloc(1, sizeof(type) * capacity);                                    \
-               return tmp;                                                                                                                                                                                                                                     \
-       }                                                                                                                                                                                                                                                                                       \
-       Vector ## name * allocVectorArray ## name(uint capacity, type * array)  {       \
-               Vector ## name * tmp = allocVector ## name(capacity);                                                           \
-               memcpy(tmp->array, array, capacity * sizeof(type));                                                                     \
-               return tmp;                                                                                                                                                                                                                                     \
-       }                                                                                                                                                                                                                                                                                       \
-       void pushVector ## name(Vector ## name *vector, type item) {                                    \
-               if (vector->size >= vector->capacity) {                                                                                                                 \
-                       uint newcap=vector->capacity * 2;                                                                                                                                       \
-                       vector->array=(type *)ourrealloc(vector->array, newcap);                                        \
-               }                                                                                                                                                                                                                                                                               \
-               vector->array[vector->size++] = item;                                                                                                                           \
-       }                                                                                                                                                                                                                                                                                       \
-       type getVector ## name(Vector ## name * vector, uint index) {                                   \
-               return vector->array[index];                                                                                                                                                            \
-       }                                                                                                                                                                                                                                                                                       \
+#define VectorImpl(name, type, defcap)                                  \
+       Vector ## name * allocDefVector ## name() {                           \
+               return allocVector ## name(defcap);                                 \
+       }                                                                     \
+       Vector ## name * allocVector ## name(uint capacity) {                 \
+               Vector ## name * tmp = (Vector ## name *)ourmalloc(sizeof(type));  \
+               tmp->size = 0;                                                      \
+               tmp->capacity = capacity;                                           \
+               tmp->array = (type *) ourcalloc(1, sizeof(type) * capacity);          \
+               return tmp;                                                         \
+       }                                                                     \
+       Vector ## name * allocVectorArray ## name(uint capacity, type * array)  { \
+               Vector ## name * tmp = allocVector ## name(capacity);               \
+               memcpy(tmp->array, array, capacity * sizeof(type));                 \
+               return tmp;                                                         \
+       }                                                                     \
+       void pushVector ## name(Vector ## name *vector, type item) {          \
+               if (vector->size >= vector->capacity) {                             \
+                       uint newcap=vector->capacity * 2;                                 \
+                       vector->array=(type *)ourrealloc(vector->array, newcap);          \
+               }                                                                   \
+               vector->array[vector->size++] = item;                               \
+       }                                                                     \
+       type getVector ## name(Vector ## name * vector, uint index) {         \
+               return vector->array[index];                                        \
+       }                                                                     \
        void setVector ## name(Vector ## name * vector, uint index, type item) { \
-               vector->array[index]=item;                                                                                                                                                                      \
-       }                                                                                                                                                                                                                                                                                       \
-       uint getSizeVector ## name(Vector ## name *vector) {                                                                    \
-               return vector->size;                                                                                                                                                                                            \
-       }                                                                                                                                                                                                                                                                                       \
-       void deleteVector ##name(Vector ##name *vector) {                                                                                       \
-               ourfree(vector->array);                                                                                                                                                                                 \
-               ourfree(vector);                                                                                                                                                                                                                \
-       }                                                                                                                                                                                                                                                                                       \
-       void clearVector ##name(Vector ## name *vector) {                                                                                       \
-               vector->size=0;                                                                                                                                                                                                                 \
+               vector->array[index]=item;                                          \
+       }                                                                     \
+       uint getSizeVector ## name(Vector ## name *vector) {                  \
+               return vector->size;                                                \
+       }                                                                     \
+       void deleteVector ## name(Vector ## name *vector) {                     \
+               ourfree(vector->array);                                             \
+               ourfree(vector);                                                    \
+       }                                                                     \
+       void clearVector ## name(Vector ## name *vector) {                     \
+               vector->size=0;                                                     \
+       }                                                                     \
+       type * exposeArray ## name(Vector ## name * vector) {                 \
+               return vector->array;                                               \
        }
 #endif