X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fiter.qh;h=c21d02121347d34b79042a31809ccd421693ab3f;hb=537313c9e52ce93b28ad6580b76e92d99f0a9d93;hp=89b455ab56f9f6ea3d25a6850a36d0f8fb961b5e;hpb=e0e847a336cdb7ab1fcb93d3cf3e1402b761a726;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/iter.qh b/qcsrc/lib/iter.qh index 89b455ab5..c21d02121 100644 --- a/qcsrc/lib/iter.qh +++ b/qcsrc/lib/iter.qh @@ -1,12 +1,18 @@ #pragma once +#if 1 +#define ITER_CONST const +#else +#define ITER_CONST +#endif + #define FOREACH_ARRAY(arr, start, end, cond, body) \ MACRO_BEGIN \ { \ for (int _i = start; _i < end; ++_i) \ { \ const noref int i = _i; \ - const noref entity it = arr[i]; \ + ITER_CONST noref entity it = arr[i]; \ if (cond) { LAMBDA(body) } \ } \ } MACRO_END @@ -20,7 +26,7 @@ for (entity _it = list##_first; _it; (_it = _it.next, ++_i)) \ { \ const noref int i = _i; \ - const noref entity it = _it; \ + ITER_CONST noref entity it = _it; \ if (cond) { LAMBDA(body) } \ } \ } MACRO_END @@ -49,6 +55,11 @@ } MACRO_END #define STRING_ITERATOR_GET(this) str2chr(this##_s, this##_i++) +#define STRING_ITERATOR_PEEK(this) str2chr(this##_s, this##_i) +#define STRING_ITERATOR_NEXT(this) MACRO_BEGIN ++this##_i; MACRO_END +#define STRING_ITERATOR_UNGET(this) MACRO_BEGIN --this##_i; MACRO_END +#define STRING_ITERATOR_SAVE(this) this##_i +#define STRING_ITERATOR_LOAD(this, n) MACRO_BEGIN this##_i = n; MACRO_END #define FOREACH_CHAR(s, cond, body) \ MACRO_BEGIN \ @@ -63,23 +74,62 @@ } MACRO_END #if defined(CSQC) + entity(entity start, .string fld, string match) _findstring = #18; entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #402; + + entity(entity start, .entity fld, entity match) _findentity = #98; entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #403; + + entity(entity start, .float fld, float match) _findfloat = #98; entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #403; + + entity(entity start, .float fld, float match) _findflags = #449; entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #450; #elif defined(SVQC) + entity(entity start, .string fld, string match) _findstring = #18; entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #402; + + entity(entity start, .entity fld, entity match) _findentity = #98; entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #403; + + entity(entity start, .float fld, float match) _findfloat = #98; entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #403; + + entity(entity start, .float fld, float match) _findflags = #449; entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #450; #elif defined(MENUQC) + entity(entity start, .string fld, string match) _findstring = #24; entity(.string fld, string match, .entity tofield) _findchainstring_tofield = #26; + + entity(entity start, .entity fld, entity match) _findentity = #25; entity(.entity fld, entity match, .entity tofield) _findchainentity_tofield = #27; + + entity(entity start, .float fld, float match) _findfloat = #25; entity(.float fld, float match, .entity tofield) _findchainfloat_tofield = #27; + + entity(entity start, .float fld, float match) _findflags = #87; entity(.float fld, float match, .entity tofield) _findchainflags_tofield = #88; #endif #define ORDERED(F) F##_UNORDERED +#define _FOREACH_ENTITY_FIND_ORDERED(T, fld, match, cond, body) \ + MACRO_BEGIN { \ + int _i = 0; \ + for (entity _it = NULL; (_it = _find##T(_it, fld, match)); ++_i) \ + { \ + const noref int i = _i; \ + ITER_CONST noref entity it = _it; \ + if (cond) LAMBDA(body) \ + } \ + } MACRO_END +#define _FOREACH_ENTITY_FIND_UNORDERED(id, T, fld, match, cond, body) \ + MACRO_BEGIN { \ + if (_FOREACH_ENTITY_FIND_##T##_##id##mutex) LOG_SEVEREF("Loop mutex held by %s", _FOREACH_ENTITY_FIND_##T##_##id##mutex); \ + _FOREACH_ENTITY_FIND_##T##_##id##mutex = __FUNC__; \ + entity _foundchain_first = _findchain##T##_tofield(fld, match, _FOREACH_ENTITY_FIND_##T##_next##id); \ + FOREACH_LIST(_foundchain, _FOREACH_ENTITY_FIND_##T##_next##id, cond, body); \ + _FOREACH_ENTITY_FIND_##T##_##id##mutex = string_null; \ + } MACRO_END #define FOREACH_ENTITY(cond, body) ORDERED(FOREACH_ENTITY)(cond, body) #define FOREACH_ENTITY_ORDERED(cond, body) \ @@ -88,110 +138,43 @@ for (entity _it = NULL; (_it = nextent(_it)); ++_i) \ { \ const noref int i = _i; \ - const noref entity it = _it; \ - if (cond) { LAMBDA(body) } \ + ITER_CONST noref entity it = _it; \ + if (cond) LAMBDA(body) \ } \ } MACRO_END /** marker field, always NULL */ .entity _FOREACH_ENTITY_fld; +.entity _FOREACH_ENTITY_FIND_entity_nextall; noref string _FOREACH_ENTITY_FIND_entity_allmutex; +#define FOREACH_ENTITY_UNORDERED(cond, body) _FOREACH_ENTITY_FIND_UNORDERED(all, entity, _FOREACH_ENTITY_fld, NULL, 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_ENTITY_FLAGS(fld, match, body) ORDERED(FOREACH_ENTITY_FLAGS)(fld, match, body) +#define FOREACH_ENTITY_FLAGS_ORDERED(fld, match, body) _FOREACH_ENTITY_FIND_ORDERED(flags, fld, match, true, body) +.entity _FOREACH_ENTITY_FIND_flags_next; noref string _FOREACH_ENTITY_FIND_flags_mutex; +#define FOREACH_ENTITY_FLAGS_UNORDERED(fld, match, body) _FOREACH_ENTITY_FIND_UNORDERED(, flags, fld, match, true, body) #ifndef MENUQC -entity(vector org, float rad, .entity tofield) _findradius_tofield = #22; +entity(vector org, float rad, .entity tofield) _findchainradius_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 +.entity _FOREACH_ENTITY_FIND_radius_next; noref string _FOREACH_ENTITY_FIND_radius_mutex; +#define FOREACH_ENTITY_RADIUS_UNORDERED(org, dist, cond, body) _FOREACH_ENTITY_FIND_UNORDERED(, radius, org, dist, cond, body) #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_FLOAT_ORDERED(fld, match, body) _FOREACH_ENTITY_FIND_ORDERED(float, fld, match, true, body) +.entity _FOREACH_ENTITY_FIND_float_next; noref string _FOREACH_ENTITY_FIND_float_mutex; +#define FOREACH_ENTITY_FLOAT_UNORDERED(fld, match, body) _FOREACH_ENTITY_FIND_UNORDERED(, float, fld, match, true, body) #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_ENT_ORDERED(fld, match, body) _FOREACH_ENTITY_FIND_ORDERED(entity, fld, match, true, body) +.entity _FOREACH_ENTITY_FIND_entity_next; noref string _FOREACH_ENTITY_FIND_entity_mutex; +#define FOREACH_ENTITY_ENT_UNORDERED(fld, match, body) _FOREACH_ENTITY_FIND_UNORDERED(, entity, fld, match, true, body) #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 +#define FOREACH_ENTITY_STRING_ORDERED(fld, match, body) _FOREACH_ENTITY_FIND_ORDERED(string, fld, match, true, body) +.entity _FOREACH_ENTITY_FIND_string_next; noref string _FOREACH_ENTITY_FIND_string_mutex; +#define FOREACH_ENTITY_STRING_UNORDERED(fld, match, body) _FOREACH_ENTITY_FIND_UNORDERED(, string, fld, match, true, body) + +#define FOREACH_ENTITY_CLASS(class, cond, body) ORDERED(FOREACH_ENTITY_CLASS)(class, cond, body) +#define FOREACH_ENTITY_CLASS_ORDERED(class, cond, body) _FOREACH_ENTITY_FIND_ORDERED(string, classname, class, cond, body) +.entity _FOREACH_ENTITY_FIND_string_nextclazz; noref string _FOREACH_ENTITY_FIND_string_clazzmutex; +#define FOREACH_ENTITY_CLASS_UNORDERED(class, cond, body) _FOREACH_ENTITY_FIND_UNORDERED(clazz, string, classname, class, cond, body)