assert_once

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / arraylist.qh

diff --git a/qcsrc/lib/arraylist.qh b/qcsrc/lib/arraylist.qh
index c2aae2b7b5476f529eaa977840852bdb5fa55045..a560474174c3ef742ebe2b711d7fe2142643e2ef 100644 (file)
--- a/qcsrc/lib/arraylist.qh
+++ b/qcsrc/lib/arraylist.qh
@@ -1,26 +1,34 @@
 #ifndef ARRAYLIST_H
 #define ARRAYLIST_H
 
-typedef int ArrayList;
+typedef entity ArrayList;
+.int al_buf;
+.int al_len;
 
-#define AL_declare(this) ArrayList this; int this##_len = (0)
-#define AL_init(this, n, default, T) \
-       do \
+#define AL_NEW(this, n, default, T) \
+       MACRO_BEGIN \
        { \
-               this = buf_create(); \
-               this##_len = n; \
-               for (int i = 0; i < this##_len; ++i) \
+               ArrayList _al = this = new(ArrayList); \
+               make_pure(_al); \
+               _al.al_buf = buf_create(); \
+               for (int i = 0, _n = _al.al_len = n; i < _n; ++i) \
                { \
                        const _AL_type__##T() it = default; \
                        AL_set##T(this, i, it); \
                } \
-       } \
-       while (0)
-#define AL_delete(this) buf_del(this)
+       } MACRO_END
+
+#define AL_DELETE(this) \
+       MACRO_BEGIN \
+       { \
+               buf_del(this.al_buf); \
+               remove(this); \
+               this = NULL; \
+       } MACRO_END
 
 #define _AL_type__s() string
-#define AL_gets(this, idx) bufstr_get(this, idx)
-#define AL_sets(this, idx, val) bufstr_set(this, idx, val)
+#define AL_gets(this, idx) bufstr_get(this.al_buf, idx)
+#define AL_sets(this, idx, val) bufstr_set(this.al_buf, idx, val)
 
 #define _AL_type__f() float
 #define AL_getf(this, idx) stof(AL_gets(this, idx))
@@ -31,15 +39,14 @@ typedef int ArrayList;
 #define AL_sete(this, idx, val) AL_setf(this, idx, etof(val))
 
 #define AL_EACH(this, T, cond, body) \
-       do \
+       MACRO_BEGIN \
        { \
                const noref ArrayList _al = this; \
-               for (int i = 0, n = this##_len; i < n; ++i) \
+               for (int i = 0, n = _al.al_len; i < n; ++i) \
                { \
                        const noref _AL_type__##T() it = AL_get##T(_al, i); \
                        if (cond) { body } \
                } \
-       } \
-       while (0)
+       } MACRO_END
 
 #endif