From 66bb51fa6148d6910da054bacd4fcbd2fa7b5bab Mon Sep 17 00:00:00 2001
From: Nao Pross <naopross@thearcway.org>
Date: Mon, 21 Jan 2019 20:44:55 +0100
Subject: Inlined functions and fix debug header

---
 debug.hpp | 107 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 53 insertions(+), 54 deletions(-)

(limited to 'debug.hpp')

diff --git a/debug.hpp b/debug.hpp
index c53fc45..a45df38 100644
--- a/debug.hpp
+++ b/debug.hpp
@@ -4,72 +4,71 @@
 #include <sstream>
 
 #ifdef DEBUG
-	#ifdef __builtin_strrchr
-		#define __FILENAME__ (\
-			__builtin_strrchr(__FILE__, '/') ? \
-			__builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
+    #define __FILENAME__ (\
+        __builtin_strrchr(__FILE__, '/') ? \
+        __builtin_strrchr(__FILE__, '/') + 1 : __FILE__)
 
-		#define npdebug_fname(); { \
-				std::cerr << "[" << __FILENAME__ << ":" << __LINE__ << "] "; \
-		}
+    #define npdebug_prep(); { \
+            std::cerr << "[" << __FILENAME__ \
+                      << ":" << __LINE__ \
+                      << ", " << __func__ \
+                      << "] " ; \
+    }
 
-		#define npdebug(...); { \
-			npdebug_fname(); \
-			np::va_debug(__VA_ARGS__); \
-		}
-	#else
-		#define npdebug(...); np::va_debug(__VA_ARGS__);
-	#endif
+    #define npdebug(...); { \
+        npdebug_prep(); \
+        np::va_debug(__VA_ARGS__); \
+    }
 
-	namespace np {
-		template<typename... Args>
-		inline void va_debug(Args&... args) {
-			(std::cerr << ... << args) << std::endl;
-		}
+    namespace np {
+        template<typename... Args>
+        inline void va_debug(Args&... args) {
+            (std::cerr << ... << args) << std::endl;
+        }
 
-		template<typename T>
-		void range_debug(const T& t) {
-			range_debug("", t);
-		}
+        template<typename T>
+        void range_debug(const T& t) {
+            range_debug("", t);
+        }
 
-		template<typename T>
-		void range_debug(const std::string& msg, const T& t) {
-			std::string out;
-			for (auto elem : t)
-				out += elem += ", ";
+        template<typename T>
+        void range_debug(const std::string& msg, const T& t) {
+            std::string out;
+            for (auto elem : t)
+                out += elem += ", ";
 
-			npdebug(msg, out);
-		}
+            npdebug(msg, out);
+        }
 
-		template<typename T>
-		T inspect(const T& t) {
-			npdebug(t);
-			return t;
-		}
+        template<typename T>
+        T inspect(const T& t) {
+            npdebug(t);
+            return t;
+        }
 
-		template<typename T>
-		T inspect(const std::string& msg, const T& t) {
-			npdebug(msg, t);
-			return t;
-		}
-	}
+        template<typename T>
+        T inspect(const std::string& msg, const T& t) {
+            npdebug(msg, t);
+            return t;
+        }
+    }
 #else
-	#define npdebug(...) {}
+    #define npdebug(...) {}
 
-	namespace np {
-		template<typename... Args>
-		inline void va_debug(Args&... args) {}
+    namespace np {
+        template<typename... Args>
+        inline void va_debug(Args&... args) {}
 
-		template<typename T>
-		inline void range_debug(const T& t) {}
+        template<typename T>
+        inline void range_debug(const T& t) {}
 
-		template<typename T>
-		inline void range_debug(const std::string& msg, const T& t) {}
+        template<typename T>
+        inline void range_debug(const std::string& msg, const T& t) {}
 
-		template<typename T>
-		T inspect(const T& t) { return t; }
+        template<typename T>
+        T inspect(const T& t) { return t; }
 
-		template<typename T>
-		T inspect(const std::string& msg, const T& t) { return t; }
-	}
+        template<typename T>
+        T inspect(const std::string& msg, const T& t) { return t; }
+    }
 #endif
-- 
cgit v1.2.1