X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fiter.qh;h=eaac63f5eff415c8d7a5aec8fa815b70a3cbe433;hb=37cf62041a76248472ef6a78feaaed33e35a2260;hp=57be59fcb895f076a772f426eba73cd94a1baf3f;hpb=c98bb7952507474a128d9b250abccb8a77bb6fd6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/iter.qh b/qcsrc/lib/iter.qh
index 57be59fcb..eaac63f5e 100644
--- a/qcsrc/lib/iter.qh
+++ b/qcsrc/lib/iter.qh
@@ -1,74 +1,203 @@
-#ifndef ITER_H
-#define ITER_H
+#pragma once
+
+#if 1
+#define ITER_CONST const
+#else
+#define ITER_CONST
+#endif
 
 #define FOREACH_ARRAY(arr, start, end, cond, body) \
-	do \
+	MACRO_BEGIN \
 	{ \
-		for (int i = start; i < end; ++i) \
+		for (int _i = start; _i < end; ++_i) \
 		{ \
-			const noref entity it = arr[i]; \
-			if (cond) { body } \
+			const noref int i = _i; \
+			ITER_CONST noref entity it = arr[i]; \
+			if (cond) { LAMBDA(body) } \
 		} \
-	} \
-	while (0)
+	} MACRO_END
+
+#define FOREACH(list, cond, body) FOREACH_LIST(list, enemy, cond, body)
 
 #define FOREACH_LIST(list, next, cond, body) \
-	do \
+	MACRO_BEGIN \
 	{ \
-		int i = 0; \
-		for (entity it = list##_first; it; (it = it.next, ++i)) \
+		int _i = 0; \
+		for (entity _it = list##_first; _it; (_it = _it.next, ++_i)) \
 		{ \
-			if (cond) { body } \
+			const noref int i = _i; \
+			ITER_CONST noref entity it = _it; \
+			if (cond) { LAMBDA(body) } \
 		} \
-	} \
-	while (0)
+	} MACRO_END
 
 #define FOREACH_WORD(words, cond, body) \
-	do \
+	MACRO_BEGIN \
 	{ \
 		string _words = words; \
-		int i = 0; \
-		for (string _it; (_it = car(_words)); (_words = cdr(_words), ++i)) \
+		int _i = 0; \
+		for (string _it; (_it = car(_words)); (_words = cdr(_words), ++_i)) \
 		{ \
+			const noref int i = _i; \
 			const noref string it = _it; \
-			if (cond) { body } \
+			if (cond) { LAMBDA(body) } \
+		} \
+	} MACRO_END
+
+#define STRING_ITERATOR(this, s, i) \
+	string this##_s = s; \
+	int this##_i = i
+
+#define STRING_ITERATOR_SET(this, s, i) \
+	MACRO_BEGIN { \
+		this##_s = s; \
+		this##_i = i; \
+	} MACRO_END
+
+#define STRING_ITERATOR_GET(this) str2chr(this##_s, this##_i++)
+
+#define FOREACH_CHAR(s, cond, body) \
+	MACRO_BEGIN \
+	{ \
+		STRING_ITERATOR(iter, s, 0); \
+		int _it; \
+		while ((_it = STRING_ITERATOR_GET(iter)) > 0) \
+		{ \
+			const noref int it = _it; \
+			if (cond) { LAMBDA(body) } \
 		} \
-	} \
-	while (0)
+	} MACRO_END
 
 #if defined(CSQC)
-	entity(.entity fld, entity match, .entity tofield) findchainentity_tofield = #403;
+	entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #402;
+	entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #403;
+	entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #403;
+	entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #450;
 #elif defined(SVQC)
-	entity(.entity fld, entity match, .entity tofield) findchainentity_tofield = #403;
+	entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #402;
+	entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #403;
+	entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #403;
+	entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #450;
 #elif defined(MENUQC)
-	entity(.entity fld, entity match, .entity tofield) findchainentity_tofield = #27;
+	entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #26;
+	entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #27;
+	entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #27;
+	entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #88;
 #endif
 
-.entity _FOREACH_ENTITY_fld;
-.entity _FOREACH_ENTITY_next;
-
-#define FOREACH_ENTITY_UNORDERED(cond, body) \
-	do { \
-		int i = 0; \
-		for (entity it = findchainentity_tofield(_FOREACH_ENTITY_fld, NULL, _FOREACH_ENTITY_next); it; (it = it._FOREACH_ENTITY_next, ++i)) \
-		{ \
-			if (cond) { body } \
-		} \
-	} \
-	while (0)
+#define ORDERED(F) F##_UNORDERED
 
+#define FOREACH_ENTITY(cond, body) ORDERED(FOREACH_ENTITY)(cond, body)
 #define FOREACH_ENTITY_ORDERED(cond, body) \
-	do { \
-		int i = 0; \
-		for (entity it = NULL; (it = nextent(it)); ++i) \
+	MACRO_BEGIN { \
+		int _i = 0; \
+		for (entity _it = NULL; (_it = nextent(_it)); ++_i) \
 		{ \
-			if (cond) { body } \
+			const noref int i = _i; \
+			ITER_CONST noref entity it = _it; \
+			if (cond) { LAMBDA(body) } \
 		} \
-	} \
-	while (0)
+	} MACRO_END
+/** marker field, always NULL */
+.entity _FOREACH_ENTITY_fld;
 
-#define FOREACH_ENTITY(cond, body) FOREACH_ENTITY_UNORDERED(cond, body)
+.entity _FOREACH_ENTITY_next;
+noref string _FOREACH_ENTITY_mutex;
+#define FOREACH_ENTITY_UNORDERED(cond, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_mutex); \
+		_FOREACH_ENTITY_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainentity_tofield(_FOREACH_ENTITY_fld, NULL, _FOREACH_ENTITY_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_next, cond, body); \
+		_FOREACH_ENTITY_mutex = string_null; \
+	} MACRO_END
 
-#define FOREACH(list, cond, body) FOREACH_LIST(list, enemy, cond, body)
 
+#ifndef MENUQC
+entity(vector org, float rad, .entity tofield) _findradius_tofield = #22;
+#define FOREACH_ENTITY_RADIUS(org, dist, cond, body) FOREACH_ENTITY_RADIUS_UNORDERED(org, dist, cond, body)
+.entity _FOREACH_ENTITY_RADIUS_next;
+noref string _FOREACH_ENTITY_RADIUS_mutex;
+#define FOREACH_ENTITY_RADIUS_UNORDERED(org, dist, cond, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_RADIUS_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_RADIUS_mutex); \
+		_FOREACH_ENTITY_RADIUS_mutex = __FUNC__; \
+		entity _foundchain_first = _findradius_tofield(org, dist, _FOREACH_ENTITY_RADIUS_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_RADIUS_next, cond, body); \
+		_FOREACH_ENTITY_RADIUS_mutex = string_null; \
+	} MACRO_END
 #endif
+
+
+#define FOREACH_ENTITY_CLASS(class, cond, body) ORDERED(FOREACH_ENTITY_CLASS)(class, cond, body)
+#define FOREACH_ENTITY_CLASS_ORDERED(class, cond, body) FOREACH_ENTITY_ORDERED(it.classname == class && (cond), body)
+.entity _FOREACH_ENTITY_CLASS_next;
+noref string _FOREACH_ENTITY_CLASS_mutex;
+#define FOREACH_ENTITY_CLASS_UNORDERED(class, cond, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_CLASS_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_CLASS_mutex); \
+		_FOREACH_ENTITY_CLASS_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainstring_tofield(classname, class, _FOREACH_ENTITY_CLASS_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_CLASS_next, cond, body); \
+		_FOREACH_ENTITY_CLASS_mutex = string_null; \
+	} MACRO_END
+
+
+
+#define FOREACH_ENTITY_FLOAT(fld, match, body) ORDERED(FOREACH_ENTITY_FLOAT)(fld, match, body)
+#define FOREACH_ENTITY_FLOAT_ORDERED(fld, match, body) FOREACH_ENTITY_ORDERED(it.fld == match, body)
+.entity _FOREACH_ENTITY_FLOAT_next;
+noref string _FOREACH_ENTITY_FLOAT_mutex;
+#define FOREACH_ENTITY_FLOAT_UNORDERED(fld, match, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_FLOAT_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_FLOAT_mutex); \
+		_FOREACH_ENTITY_FLOAT_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainfloat_tofield(fld, match, _FOREACH_ENTITY_FLOAT_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_FLOAT_next, true, body); \
+		_FOREACH_ENTITY_FLOAT_mutex = string_null; \
+	} MACRO_END
+
+
+
+#define FOREACH_ENTITY_FLAGS(fld, match, body) ORDERED(FOREACH_ENTITY_FLAGS)(fld, match, body)
+#define FOREACH_ENTITY_FLAGS_ORDERED(fld, match, body) FOREACH_ENTITY_ORDERED(it.fld & match, body)
+.entity _FOREACH_ENTITY_FLAGS_next;
+noref string _FOREACH_ENTITY_FLAGS_mutex;
+#define FOREACH_ENTITY_FLAGS_UNORDERED(fld, match, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_FLAGS_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_FLAGS_mutex); \
+		_FOREACH_ENTITY_FLAGS_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainflags_tofield(fld, match, _FOREACH_ENTITY_FLAGS_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_FLAGS_next, true, body); \
+		_FOREACH_ENTITY_FLAGS_mutex = string_null; \
+	} MACRO_END
+
+
+
+#define FOREACH_ENTITY_ENT(fld, match, body) ORDERED(FOREACH_ENTITY_ENT)(fld, match, body)
+#define FOREACH_ENTITY_ENT_ORDERED(fld, match, body) FOREACH_ENTITY_ORDERED(it.fld == match, body)
+.entity _FOREACH_ENTITY_ENT_next;
+noref string _FOREACH_ENTITY_ENT_mutex;
+#define FOREACH_ENTITY_ENT_UNORDERED(fld, match, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_ENT_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_ENT_mutex); \
+		_FOREACH_ENTITY_ENT_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainentity_tofield(fld, match, _FOREACH_ENTITY_ENT_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_ENT_next, true, body); \
+		_FOREACH_ENTITY_ENT_mutex = string_null; \
+	} MACRO_END
+
+
+
+#define FOREACH_ENTITY_STRING(fld, match, body) ORDERED(FOREACH_ENTITY_STRING)(fld, match, body)
+#define FOREACH_ENTITY_STRING_ORDERED(fld, match, body) FOREACH_ENTITY_ORDERED(it.fld == match, body)
+.entity _FOREACH_ENTITY_STRING_next;
+noref string _FOREACH_ENTITY_STRING_mutex;
+#define FOREACH_ENTITY_STRING_UNORDERED(fld, match, body) \
+	MACRO_BEGIN { \
+		if (_FOREACH_ENTITY_STRING_mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_STRING_mutex); \
+		_FOREACH_ENTITY_STRING_mutex = __FUNC__; \
+		entity _foundchain_first = _findchainstring_tofield(fld, match, _FOREACH_ENTITY_STRING_next); \
+		FOREACH_LIST(_foundchain, _FOREACH_ENTITY_STRING_next, true, body); \
+		_FOREACH_ENTITY_STRING_mutex = string_null; \
+	} MACRO_END