X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=d5745ed8a36ae2cbe139a14de0f1ba76c1b22d5c;hp=6bfa6289f1174b604293c09464bd9746d783e46e;hb=0f5501ad79950e9658fb672ac6b97a608e3a2dd9;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 6bfa628..d5745ed 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,10 +1,8 @@
-#ifdef WIN32
-#include <windows.h>
-#endif
-#include <signal.h>
-#include <iostream>
 #include <typeinfo>
+#include <signal.h>
 #include <msp/debug/demangle.h>
+#include <msp/debug/errorreporter.h>
+#include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -18,29 +16,16 @@ void *Application::data_ = 0;
 
 Application::Application():
 	exit_code(0)
-{ }
-
-/**
-Constructs an instance of the registered application class and runs it.  If the
-application throws a usage_error, a help message is printed.  The GetOpt class
-will throw such exceptions automatically in error conditions.
+{
+	if(app_)
+		throw logic_error("instance already exists");
+}
 
-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, void *data)
 {
-	static bool called = false;
-	if(called)
-	{
-		cerr<<"Trying to call Application::run_app twice!\n";
-		return 125;
-	}
-	called = true;
-
 	if(!starter_)
 	{
-		cerr<<"Trying to run with no RegisteredApplication class!\n";
+		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
 	}
 
@@ -54,8 +39,7 @@ int Application::run(int argc, char **argv, void *data)
 		}
 		catch(const usage_error &e)
 		{
-			cerr<<e.what()<<'\n';
-			cerr<<e.help()<<'\n';
+			IO::print(IO::cerr, "%s\n%s\n", e.what(), e.help());
 			return 1;
 		}
 
@@ -67,25 +51,24 @@ int Application::run(int argc, char **argv, void *data)
 	}
 	catch(const exception &e)
 	{
-		delete app_;
+		bool handled = false;
+		if(const Debug::ErrorReporter *er = Debug::ErrorReporter::get_current())
+			handled = er->report_uncaught_exception(e);
 
-#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';
-#endif
+		if(!handled)
+		{
+			IO::print(IO::cerr, "An uncaught exception occurred.\n");
+			IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
+			IO::print(IO::cerr, "  what(): %s\n", e.what());
+		}
+
+		delete app_;
+		app_ = 0;
 
 		return 124;
 	}
 }
 
-/**
-Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
-main loop should monitor the done member variable and return exit_code.
-*/
 int Application::main()
 {
 	done = false;
@@ -95,26 +78,17 @@ int Application::main()
 	return exit_code;
 }
 
-/**
-Sets the specified signal to be delivered to the sighandler member function.
-*/
 void Application::catch_signal(int s)
 {
 	signal(s, &sighandler_);
 }
 
-/**
-Causes the application to exit gracefully with the given exit code.
-*/
 void Application::exit(int c)
 {
 	done = true;
 	exit_code = c;
 }
 
-/**
-Static wrapper function to call a member function of the Application instance.
-*/
 void Application::sighandler_(int s)
 {
 	app_->sighandler(s);