Rename error.* to except.*

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0e93a9c653064ec4aeccbd39d358a80e74fb7be9..e1a93141480c9cf3459c483d5b66c5440529703b 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -6,10 +6,12 @@ Distributed under the LGPL
 */
 #include <signal.h>
 #include <iostream>
+#include "../debug/backtrace.h"
+#include "../debug/demangle.h"
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 
@@ -40,17 +42,43 @@ int Application::run(int argc, char **argv)
 
        try
        {
-               app_=reg_app_->create_app(argc, argv);
+               try
+               {
+                       app_=reg_app_->create_app(argc, argv);
+               }
+               catch(const UsageError &e)
+               {
+                       reg_app_->usage(e.what(), argv[0], e.get_brief());
+                       return 1;
+               }
+
+               int result=app_->main();
+               delete app_;
+               return result;
        }
-       catch(const UsageError &e)
+       catch(const exception &e)
        {
-               reg_app_->usage(e.what(), argv[0], e.get_brief());
-               return 1;
-       }
+               cerr<<"An uncaught exception occurred.\n";
+               cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
+               cerr<<"  what(): "<<e.what()<<'\n';
 
-       int result=app_->main();
-       delete app_;
-       return result;
+               const Exception *exc=dynamic_cast<const Exception *>(&e);
+               if(exc && !exc->get_backtrace().get_frames().empty())
+               {
+                       cerr<<"  backtrace:\n";
+                       const Debug::Backtrace::FrameSeq &frames=exc->get_backtrace().get_frames();
+                       for(Debug::Backtrace::FrameSeq::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+                       {
+                               cerr<<"    "<<i->address;
+                               if(!i->symbol.empty())
+                                       cerr<<" in "<<i->symbol;
+                               cerr<<" from "<<i->file<<'\n';
+                       }
+               }
+
+               delete app_;
+               return 124;
+       }
 }
 
 /**