X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Flinkedlist.qh;h=0dd430722f755218f5f796883a5dcf4317caf885;hb=ff5abbe10f6a0542cc40e931d0f61aafa359eff9;hp=a4200122f473452e3c76c4d9ca40c7d71e89c939;hpb=5180d45c194e9b05a10713846731a312376a3bef;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/linkedlist.qh b/qcsrc/lib/linkedlist.qh
index a4200122f..0dd430722 100644
--- a/qcsrc/lib/linkedlist.qh
+++ b/qcsrc/lib/linkedlist.qh
@@ -1,15 +1,14 @@
-#ifndef LINKEDLIST_H
-#define LINKEDLIST_H
+#pragma once
 
 CLASS(LinkedListNode, Object)
-	ATTRIB(LinkedListNode, ll_data, entity, NULL)
-	ATTRIB(LinkedListNode, ll_prev, LinkedListNode, NULL)
-	ATTRIB(LinkedListNode, ll_next, LinkedListNode, NULL)
+	ATTRIB(LinkedListNode, ll_data, entity);
+	ATTRIB(LinkedListNode, ll_prev, LinkedListNode);
+	ATTRIB(LinkedListNode, ll_next, LinkedListNode);
 ENDCLASS(LinkedListNode)
 
 CLASS(LinkedList, Object)
-	ATTRIB(LinkedList, ll_head, LinkedListNode, NULL);
-	ATTRIB(LinkedList, ll_tail, LinkedListNode, NULL);
+	ATTRIB(LinkedList, ll_head, LinkedListNode);
+	ATTRIB(LinkedList, ll_tail, LinkedListNode);
 ENDCLASS(LinkedList)
 
 #define LL_NEW() NEW(LinkedList)
@@ -41,34 +40,45 @@ entity LL_POP(LinkedList this)
 	LinkedListNode prev = n.ll_prev;
 	if (prev) (this.ll_tail = prev).ll_next = NULL;
 	else this.ll_head = this.ll_tail = NULL;
-	remove(n);
+	delete(n);
 	return e;
 }
 
-#define LL_DELETE(this) \
-	do \
+#define LL_CLEAR(...) EVAL_LL_CLEAR(OVERLOAD(LL_CLEAR, __VA_ARGS__))
+#define EVAL_LL_CLEAR(...) __VA_ARGS__
+#define LL_CLEAR_1(this) LL_CLEAR_2(this, LAMBDA())
+#define LL_CLEAR_2(this, dtor) \
+	MACRO_BEGIN \
 	{ \
 		LinkedList _ll = this; \
 		assert(_ll); \
 		while (_ll.ll_tail) \
 		{ \
 			entity it = LL_POP(_ll); \
-			if (it) remove(it); \
+			if (!it) continue; \
+			dtor \
+			delete(it); \
 		} \
+	} MACRO_END
+
+#define LL_DELETE(...) EVAL_LL_DELETE(OVERLOAD(LL_DELETE, __VA_ARGS__))
+#define EVAL_LL_DELETE(...) __VA_ARGS__
+#define LL_DELETE_1(this) LL_DELETE_2(this, LAMBDA())
+#define LL_DELETE_2(this, dtor) \
+	MACRO_BEGIN \
+	{ \
+		LL_CLEAR_2(this, dtor); \
+		delete(this); \
 		this = NULL; \
-	} \
-	while (0)
+	} MACRO_END
 
 #define LL_EACH(list, cond, body) \
-	do                                                                  \
+	MACRO_BEGIN                                                         \
 	{                                                                   \
 		noref int i = 0;                                                \
 		for (entity _it = list.ll_head; _it; (_it = _it.ll_next, ++i))  \
 		{                                                               \
-			noref entity it = _it.ll_data;                              \
+			ITER_CONST noref entity it = _it.ll_data;                   \
 			if (cond) { body }                                          \
 		}                                                               \
-	}                                                                   \
-	while (0)
-
-#endif
+	} MACRO_END