Improve GetOpt help generation

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index c93475fea972e84985f82acfb08fb030018407bd..f64f350e83e362b1d0cde831a7f0f542e52388b2 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,8 +4,10 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <signal.h>
 #include <iostream>
+#include <typeinfo>
 #include "../debug/backtrace.h"
 #include "../debug/demangle.h"
 #include "../time/units.h"
@@ -17,6 +19,11 @@ using namespace std;
 
 namespace Msp {
 
+Application::Application():
+       exit_code(0),
+       loop_mode_(TICK_SLEEP)
+{ }
+
 /**
 Constructs an instance of the registered application class and runs it.  If the
 application throws a UsageError, the static usage() function is called.
@@ -24,7 +31,7 @@ application throws a UsageError, the static usage() function is called.
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */
-int Application::run(int argc, char **argv)
+int Application::run(int argc, char **argv, void *data)
 {
        static bool called=false;
        if(called)
@@ -40,6 +47,8 @@ int Application::run(int argc, char **argv)
                return 126;
        }
 
+       data_=data;
+
        try
        {
                try
@@ -58,6 +67,12 @@ int Application::run(int argc, char **argv)
        }
        catch(const exception &e)
        {
+               delete app_;
+
+#ifdef WIN32
+               string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
+               MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+#else
                cerr<<"An uncaught exception occurred.\n";
                cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
                cerr<<"  what(): "<<e.what()<<'\n';
@@ -66,17 +81,12 @@ int Application::run(int argc, char **argv)
                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';
-                       }
+                       const list<Debug::Backtrace::StackFrame> &frames=exc->get_backtrace().get_frames();
+                       for(list<Debug::Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
+                               cerr<<"    "<<*i<<'\n';
                }
+#endif
 
-               delete app_;
                return 124;
        }
 }
@@ -96,11 +106,6 @@ void Application::usage(const char *reason, const char *, bool)
        cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
 }
 
-Application::Application():
-       exit_code(0),
-       loop_mode_(TICK_SLEEP)
-{ }
-
 /**
 Default main loop.  Behavior depends on loop_mode_.  A custom main loop should
 monitor the done member variable and return exit_code.
@@ -188,6 +193,7 @@ void Application::sighandler_(int s)
        app_->sighandler(s);
 }
 
+
 Application::RegBase::RegBase()
 {
        if(reg_app_)
@@ -201,5 +207,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp