X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fregistry.qh;h=7ce923c537d8242ff77cd73f336ab438d173f57b;hb=cc0ec16ac6f802abd6b081f8aa29432d6336b99a;hp=a2284b19448a10428963439464da0b91940a5b73;hpb=71ce27cd515d7e8157535466ef357f83253b64f0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh
index a2284b194..7ce923c53 100644
--- a/qcsrc/lib/registry.qh
+++ b/qcsrc/lib/registry.qh
@@ -1,5 +1,4 @@
-#ifndef REGISTRY_H
-#define REGISTRY_H
+#pragma once
 
 #include "oo.qh"
 
@@ -22,14 +21,26 @@
  *     REGISTER_REGISTRY(Foos)
  */
 #define REGISTRY(id, max) \
-	void Register##id() {} \
+	void Register##id(); \
+	[[accumulate]] REGISTRY_BEGIN(id) {} \
+	[[accumulate]] REGISTRY_END(id) {} \
+	void _Register##id() {} \
+	void Register##id() { REGISTRY_BEGIN_(id); _Register##id(); REGISTRY_END_(id); } \
 	const int id##_MAX = max; \
+	int id##_COUNT; \
 	noref entity id##_first, id##_last; \
 	_R_MAP(_##id, id##_MAX); \
 	SHUTDOWN(id) { _R_DEL(_##id); } \
-	int id##_COUNT; \
 	entity _##id##_from(int i, entity null) { if (i >= 0 && i < id##_COUNT) { entity e = _R_GET(_##id, i); if (e) return e; } return null; }
 
+/** Called before initializing a registry. */
+#define REGISTRY_BEGIN(id) [[accumulate]] void REGISTRY_BEGIN_(id) { noref void() f = Register##id; } void REGISTRY_BEGIN_(id)
+#define REGISTRY_BEGIN_(id) Register##id##_First()
+
+/** Called after initializing a registry. */
+#define REGISTRY_END(id) [[accumulate]] void REGISTRY_END_(id) { noref void() f = Register##id; } void REGISTRY_END_(id)
+#define REGISTRY_END_(id) Register##id##_Done()
+
 REGISTRY(Registries, BITS(8))
 
 /** registered item identifier */
@@ -40,8 +51,7 @@ REGISTRY(Registries, BITS(8))
  * Must be followed by a semicolon or a function body with a `this` parameter.
  * Wrapper macros may perform actions after user initialization like so:
  *     #define REGISTER_FOO(id) \
- *         REGISTER(Foos, FOO, id, m_id, NEW(Foo)); \
- *         REGISTER_INIT_POST(FOO, id) { \
+ *         REGISTER(Foos, FOO, id, m_id, NEW(Foo)) { \
  *             print("Registering foo #", this.m_id + 1, "\n"); \
  *         } \
  *         REGISTER_INIT(FOO, id)
@@ -53,48 +63,46 @@ REGISTRY(Registries, BITS(8))
  * @param fld       The field to store the locally unique unique entity id
  * @param inst      An expression to create a new instance, invoked for every registration
  */
-#define REGISTER(...) EVAL(OVERLOAD(REGISTER, __VA_ARGS__))
+#define REGISTER(...) EVAL_REGISTER(OVERLOAD_(REGISTER, __VA_ARGS__))
+#define EVAL_REGISTER(...) __VA_ARGS__
 #define REGISTER_5(registry, ns, id, fld, inst) REGISTER_4(registry, ns##_##id, fld, inst)
 #define REGISTER_4(registry, id, fld, inst) \
 	entity id; \
 	REGISTER_INIT(id) {} \
-	REGISTER_INIT_POST(id) {} \
 	void Register_##id() \
 	{ \
-		if (registry##_COUNT >= registry##_MAX) LOG_FATALF("Registry capacity exceeded (%s)", ftos(registry##_MAX)); \
+		if (registry##_COUNT >= registry##_MAX) LOG_FATALF("Registry capacity exceeded (%d)", registry##_MAX); \
 		entity this = id = inst; \
 		this.registered_id = #id; \
 		REGISTRY_PUSH(registry, fld, this); \
 		Register_##id##_init(this); \
-		Register_##id##_init_post(this); \
 	} \
-	ACCUMULATE_FUNCTION(Register##registry, Register_##id) \
+	ACCUMULATE_FUNCTION(_Register##registry, Register_##id) \
 	REGISTER_INIT(id)
 
-#define REGISTRY_PUSH(registry, fld, it) do { \
+#define REGISTRY_PUSH(registry, fld, it) MACRO_BEGIN { \
 	it.fld = registry##_COUNT; \
 	_R_SET(_##registry, registry##_COUNT, it); \
 	++registry##_COUNT; \
 	if (!registry##_first) registry##_first = it; \
 	if (registry##_last)   registry##_last.REGISTRY_NEXT = it; \
 	registry##_last = it; \
-} while (0)
+} MACRO_END
 
-#define REGISTRY_RESERVE(registry, fld, id, suffix) do { \
-	entity e = new(registry_reserved); \
-	make_pure(e); \
+#define REGISTRY_RESERVE(registry, fld, id, suffix) MACRO_BEGIN { \
+	entity e = new_pure(registry_reserved); \
 	e.registered_id = #id "/" #suffix; \
 	REGISTRY_PUSH(registry, fld, e); \
-} while (0)
+} MACRO_END
 
 #define REGISTER_INIT(id) [[accumulate]] void Register_##id##_init(entity this)
-#define REGISTER_INIT_POST(id) [[accumulate]] void Register_##id##_init_post(entity this)
 
 /** internal next pointer */
 #define REGISTRY_NEXT enemy
 .entity REGISTRY_NEXT;
 
-#define REGISTRY_SORT(...) EVAL(OVERLOAD(REGISTRY_SORT, __VA_ARGS__))
+#define REGISTRY_SORT(...) EVAL_REGISTRY_SORT(OVERLOAD(REGISTRY_SORT, __VA_ARGS__))
+#define EVAL_REGISTRY_SORT(...) __VA_ARGS__
 #define REGISTRY_SORT_1(id) REGISTRY_SORT_2(id, 0)
 #define REGISTRY_SORT_2(id, skip) \
 	void _REGISTRY_SWAP_##id(int i, int j, entity pass) \
@@ -142,13 +150,14 @@ void Registry_send(string id, string hash);
 	string REGISTRY_HASH(id); \
 	STATIC_INIT(Registry_check_##id) \
 	{ \
-		string algo = "SHA256"; \
+		/* Note: SHA256 isn't always available, use MD4 instead */ \
+		string algo = "MD4"; \
 		string join = ":"; \
 		string s = ""; \
-		FOREACH(id, true, LAMBDA(s = strcat(s, join, it.registered_id))); \
+		FOREACH(id, true, s = strcat(s, join, it.registered_id)); \
 		s = substring(s, strlen(join), -1); \
 		string h = REGISTRY_HASH(id) = strzone(digest_hex(algo, s)); \
-		LOG_TRACEF(#id ": %s\n[%s]\n", h, s); \
+		LOG_DEBUGF(#id ": %s\n[%s]\n", h, s); \
 	} \
 	void Registry_check(string r, string sv) \
 	{ \
@@ -163,7 +172,8 @@ void Registry_send(string id, string hash);
 	} \
 	void Registry_send_all() { Registry_send(#id, REGISTRY_HASH(id)); } \
 
-#define REGISTER_REGISTRY(...) EVAL(OVERLOAD(REGISTER_REGISTRY, __VA_ARGS__))
+#define REGISTER_REGISTRY(...) EVAL_REGISTER_REGISTRY(OVERLOAD(REGISTER_REGISTRY, __VA_ARGS__))
+#define EVAL_REGISTER_REGISTRY(...) __VA_ARGS__
 #define REGISTER_REGISTRY_1(id) REGISTER_REGISTRY_2(id, #id)
 #define REGISTER_REGISTRY_2(id, str) \
 	ACCUMULATE_FUNCTION(__static_init, Register##id) \
@@ -172,6 +182,3 @@ void Registry_send(string id, string hash);
 		ATTRIB(id##Registry, REGISTRY_NEXT, entity, id##_first) \
 	ENDCLASS(id##Registry) \
 	REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry));
-
-
-#endif