From 9ec41fdd2db32e427acb588536044a2d5f905397 Mon Sep 17 00:00:00 2001
From: Deukhoofd <deukhoofd@gmail.com>
Date: Sun, 26 Jul 2020 17:22:36 +0200
Subject: [PATCH] Rework how the C Interface shows exceptions

---
 CInterface/Core.cpp |  1 -
 CInterface/Core.hpp | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CInterface/Core.cpp b/CInterface/Core.cpp
index b12294d..75f7a32 100644
--- a/CInterface/Core.cpp
+++ b/CInterface/Core.cpp
@@ -1,4 +1,3 @@
 #include "Core.hpp"
 
-char* ExceptionHandler::_lastException = 0;
 export const char* CreatureLib_C_GetLastException() { return ExceptionHandler::GetLastException(); }
diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp
index fb903cd..e6ddf34 100644
--- a/CInterface/Core.hpp
+++ b/CInterface/Core.hpp
@@ -3,17 +3,23 @@
 
 #include <cstring>
 #include <exception>
+#include <sstream>
 #include <string>
 #define export extern "C" [[maybe_unused]]
 
 #define CreatureLibException 1;
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
 class ExceptionHandler {
-    static char* _lastException;
+    static std::string _lastException;
 
 public:
-    static void SetLastException(const std::exception& e) { _lastException = strcpy(_lastException, e.what()); }
-    static const char* GetLastException() { return _lastException; }
+    static void SetLastException(std::string file, std::string function, int line, const std::exception& e) {
+        std::stringstream ss;
+        ss << "[" << file << ", " << function << "-" << line << "] " << e.what();
+        _lastException = ss.str();
+    }
+    static const char* GetLastException() { return _lastException.c_str(); }
 };
 
 #define Try(data)                                                                                                      \
@@ -21,7 +27,7 @@ public:
         data;                                                                                                          \
         return 0;                                                                                                      \
     } catch (const std::exception& e) {                                                                                \
-        ExceptionHandler::SetLastException(e);                                                                         \
+        ExceptionHandler::SetLastException(__FILENAME__, __FUNCTION__, __LINE__, e);                                   \
         return CreatureLibException;                                                                                   \
     }