X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Flog.qh;h=02a25cdad0d0679d577c00191a9835e4750f5084;hp=8a52073396bdedbedd9d15e06cd72ac07f8f9cbf;hb=3cfb64730d883ae9ccf0315f365da19345270890;hpb=001abccbb0f5ec3197dd59e962298e1010161dc6

diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh
index 8a5207339..02a25cdad 100644
--- a/qcsrc/lib/log.qh
+++ b/qcsrc/lib/log.qh
@@ -1,18 +1,24 @@
-#ifndef LOG_H
-#define LOG_H
-
-#define _printferr(...) error(sprintf(__VA_ARGS__))
-#define _printfbt(...) backtrace(sprintf(__VA_ARGS__))
-#define printf(...) print(sprintf(__VA_ARGS__))
-#define dprintf(...) dprint(sprintf(__VA_ARGS__))
-#define _dprintf2(...) \
-	MACRO_BEGIN \
-	{ \
-		if (autocvar_developer > 1) dprintf(__VA_ARGS__); \
-	} MACRO_END
+#pragma once
+
+#include "progname.qh"
 
 #define assert(expr, ...) _assert(LOG_SEVERE, expr, __VA_ARGS__)
-#define ASSERT(expr, ...) _assert(LOG_FATAL, expr, __VA_ARGS__)
+#define devassert(...) MACRO_BEGIN if (autocvar_developer) assert(__VA_ARGS__); MACRO_END
+
+#define assert_once(expr, ...) \
+	MACRO_BEGIN { \
+		static bool __once; \
+		if (!__once) \
+		{ \
+			assert(expr, __VA_ARGS__); \
+			__once = true; \
+		} \
+	} MACRO_END
+#define devassert_once(...) MACRO_BEGIN if (autocvar_developer) assert_once(__VA_ARGS__); MACRO_END
+
+#define demand(expr, ...) _assert(LOG_FATAL, expr, __VA_ARGS__)
+#define devdemand(...) MACRO_BEGIN if (autocvar_developer) demand(__VA_ARGS__); MACRO_END
+
 #define _assert(f, expr, then) \
 	MACRO_BEGIN \
 	{ \
@@ -25,41 +31,55 @@
 
 #define ASSERT_LESS(name, var, const) noref int name[(const - var + 1)];
 
-#define _LOG(f, level, s) f("[::"level "] ["__FILE__ ":%s:%.0f] %s", __FUNC__, __LINE__, s)
 
-#define  LOG_FATAL(...) _LOG_FATAL(strcat("", __VA_ARGS__))
+#if defined(MENUQC)
+string(string...) strcat0n = #53;
+#else
+string(string...) strcat0n = #115;
+#endif
+
+#define __SOURCELOC__ (sprintf("^9"__FILE__"^7"  ":"  "^9%s^7"  ":"  "^9"STR(__LINE__)"^7", __FUNC__))
+
+#define _LOG(f, level, s) \
+	MACRO_BEGIN { \
+		f(sprintf("^9[::^7" PROGNAME "^9::" level "^9] [%s^9]\n^7%s\n", __SOURCELOC__, s)); \
+	} MACRO_END
+
+#define  LOG_FATAL(...) _LOG_FATAL(strcat0n(__VA_ARGS__))
 #define  LOG_FATALF(...) _LOG_FATAL(sprintf(__VA_ARGS__))
-#define _LOG_FATAL(s) _LOG(_printferr, "FATAL", s)
+#define _LOG_FATAL(s) _LOG(error, "^1FATAL", s)
 
-#define  LOG_SEVERE(...) _LOG_SEVERE(strcat("", __VA_ARGS__))
+#define  LOG_SEVERE(...) _LOG_SEVERE(strcat0n(__VA_ARGS__))
 #define  LOG_SEVEREF(...) _LOG_SEVERE(sprintf(__VA_ARGS__))
-#define _LOG_SEVERE(s) _LOG(_printfbt, "SEVERE", s)
+#define _LOG_SEVERE(s) _LOG(backtrace, "^1SEVERE", s)
 
-#define  LOG_WARNING(...) _LOG_WARNING(strcat("", __VA_ARGS__))
+#define  LOG_WARNING(...) _LOG_WARNING(strcat0n(__VA_ARGS__))
 #define  LOG_WARNINGF(...) _LOG_WARNING(sprintf(__VA_ARGS__))
-#define _LOG_WARNING(s) _LOG(printf, "WARNING", s)
+#define _LOG_WARNING(s) _LOG(print, "^3WARNING", s)
 
-#define  LOG_INFO(...) \
-	MACRO_BEGIN \
-	{ \
-		if (autocvar_developer) _LOG_INFO(strcat("", __VA_ARGS__)); \
-		else print(__VA_ARGS__); \
-	} MACRO_END
-#define  LOG_INFOF(...) \
-	MACRO_BEGIN \
-	{ \
-		if (autocvar_developer) _LOG_INFO(sprintf(__VA_ARGS__)); \
-		else printf(__VA_ARGS__); \
+#define  LOG_INFO(...) _LOG_INFO(strcat0n(__VA_ARGS__))
+#define  LOG_INFOF(...) _LOG_INFO(sprintf(__VA_ARGS__))
+#define _LOG_INFO(s) \
+	MACRO_BEGIN { \
+		string ___s = s; \
+		if (autocvar_developer) \
+			_LOG(print, "^5INFO", ___s); \
+		else \
+			print(___s); \
 	} MACRO_END
-#define _LOG_INFO(s) _LOG(printf, "INFO", s)
 
-#define  LOG_TRACE(...) _LOG_TRACE(strcat("", __VA_ARGS__))
+#define  LOG_TRACE(...) _LOG_TRACE(strcat0n(__VA_ARGS__))
 #define  LOG_TRACEF(...) _LOG_TRACE(sprintf(__VA_ARGS__))
-#define _LOG_TRACE(s) _LOG(dprintf, "TRACE", s)
+#define _LOG_TRACE(s) _LOG(dprint, "^6TRACE", s)
 
-#define  LOG_DEBUG(...) _LOG_DEBUG(strcat("", __VA_ARGS__))
+#define  LOG_DEBUG(...) _LOG_DEBUG(strcat0n(__VA_ARGS__))
 #define  LOG_DEBUGF(...) _LOG_DEBUG(sprintf(__VA_ARGS__))
-#define _LOG_DEBUG(s) _LOG(_dprintf2, "DEBUG", s)
+#define _LOG_DEBUG(s) _LOG(dprint2, "^2DEBUG", s)
+
+#define dprint2(msg) \
+	MACRO_BEGIN { \
+		if (autocvar_developer > 1) dprint(msg); \
+	} MACRO_END
 
 // TODO: this sucks, lets find a better way to do backtraces?
 #ifdef SVQC
@@ -86,11 +106,9 @@ noref bool autocvar_prvm_backtraceforwarnings;
 		bool war = autocvar_prvm_backtraceforwarnings; \
 		bt_cvar_set("developer", "1"); \
 		bt_cvar_set("prvm_backtraceforwarnings", "1"); \
-		print("\n--- CUT HERE ---\n", msg, "\n"); \
+		print("\n--- CUT HERE ---\n", msg); \
 		_backtrace(); \
 		print("\n--- CUT UNTIL HERE ---\n"); \
 		bt_cvar_set("developer", ftos(dev)); \
 		bt_cvar_set("prvm_backtraceforwarnings", ftos(war)); \
 	} MACRO_END
-
-#endif