From d440c3f50a918a932293ad98bcec96eaa4683222 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Sun, 4 Dec 2011 01:19:09 -0800
Subject: Reworked some things in the architecture, mainly exceptions and
 asserts. -) Removed Assert() -) Added AAssert(), IAssert(), RAssert(),
 TAssert() and Failure() -) Reworked all asserts in the code, and added
 meaningful messages to them. -) Changed the way the startup code is
 generated; BALAU_STARTUP is no longer necessary.

---
 src/Exceptions.cc | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/Exceptions.cc')

diff --git a/src/Exceptions.cc b/src/Exceptions.cc
index 94de408..d7d360f 100644
--- a/src/Exceptions.cc
+++ b/src/Exceptions.cc
@@ -52,7 +52,7 @@ void Balau::GeneralException::genTrace() {
 
     String line;
     for (int i = 0; i < n; i++)
-        line += String().set("%08x ", trace[i]);
+        line += String().set("%08lx ", (uintptr_t) trace[i]);
 
     m_trace.push_back(line);
     Dl_info info;
@@ -68,7 +68,7 @@ void Balau::GeneralException::genTrace() {
         } else {
             demangled = NULL;
         }
-        line.set("%i: %s(%s%c0x%x) [0x%08x]", i, info.dli_fname, info.dli_sname ? (demangled ? (status == 0 ? demangled : info.dli_sname) : info.dli_sname) : "??", dist < 0 ? '-' : '+', dist < 0 ? -dist : dist, trace[i]);
+        line.set("%i: %s(%s%c0x%lx) [0x%08lx]", i, info.dli_fname, info.dli_sname ? (demangled ? (status == 0 ? demangled : info.dli_sname) : info.dli_sname) : "??", dist < 0 ? '-' : '+', dist < 0 ? -dist : dist, (uintptr_t) trace[i]);
         m_trace.push_back(line);
         if (demangled)
             free(demangled);
@@ -79,3 +79,20 @@ void Balau::GeneralException::genTrace() {
 
 
 #endif
+
+static void ExitHelperInner(const Balau::String & msg, const char * details) throw (Balau::RessourceException) {
+    throw Balau::RessourceException(msg, details);
+}
+
+void Balau::ExitHelper(const String & msg, const char * fmt, ...) {
+    if (fmt) {
+        String details;
+        va_list ap;
+        va_start(ap, fmt);
+        details.set(fmt, ap);
+        va_end(ap);
+        ExitHelperInner(msg, details.to_charp());
+    } else {
+        ExitHelperInner(msg, NULL);
+    }
+}
-- 
cgit v1.2.3