xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exceptions: use const char* what() instead of String description()

Browse Source
This commit is contained in:
Maxime Coste 2013-04-11 13:57:35 +02:00
parent c699172110
commit 35d0d5b2ea
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assert.cc
View File

@ -13,7 +13,7 @@ struct assert_failed : logic_error
assert_failed(const String& message)
: m_message(message) {}
String description() const override { return m_message; }
const char* what() const override { return m_message.c_str(); }
private:
String m_message;
};

8
src/client_manager.cc
View File

@ -67,8 +67,8 @@ void ClientManager::create_client(std::unique_ptr<UserInterface>&& ui,
}
catch (Kakoune::runtime_error& error)
{
context->print_status({ error.description(), get_color("Error") });
context->hooks().run_hook("RuntimeError", error.description(), *context);
context->print_status({ error.what(), get_color("Error") });
context->hooks().run_hook("RuntimeError", error.what(), *context);
}
catch (Kakoune::client_removed&)
{
@ -84,8 +84,8 @@ void ClientManager::create_client(std::unique_ptr<UserInterface>&& ui,
}
catch (Kakoune::runtime_error& error)
{
context->print_status({ error.description(), get_color("Error") });
context->hooks().run_hook("RuntimeError", error.description(), *context);
context->print_status({ error.what(), get_color("Error") });
context->hooks().run_hook("RuntimeError", error.what(), *context);
}
catch (Kakoune::client_removed&)
{

2
src/exception.cc
View File

@ -7,7 +7,7 @@
namespace Kakoune
{
String exception::description() const
const char* exception::what() const
{
return typeid(*this).name();
}

10
src/exception.hh
View File

@ -9,18 +9,18 @@ namespace Kakoune
struct exception
{
virtual ~exception() {}
virtual String description() const;
virtual const char* what() const;
};
struct runtime_error : exception
{
runtime_error(const String& description)
: m_description(description) {}
runtime_error(String what)
: m_what(std::move(what)) {}
String description() const override { return m_description; }
const char* what() const override { return m_what.c_str(); }
private:
String m_description;
String m_what;
};
struct logic_error : exception

4
src/main.cc
View File

@ -986,7 +986,7 @@ int main(int argc, char* argv[])
}
catch (Kakoune::runtime_error& error)
{
write_debug("error while parsing kakrc: " + error.description());
write_debug("error while parsing kakrc: "_str + error.what());
}
if (parser.positional_count() != 0)
@ -1010,7 +1010,7 @@ int main(int argc, char* argv[])
}
catch (Kakoune::exception& error)
{
on_assert_failed(("uncaught exception:\n" + error.description()).c_str());
on_assert_failed(("uncaught exception:\n"_str + error.what()).c_str());
return -1;
}
catch (std::exception& error)

2
src/remote.cc
View File

@ -450,7 +450,7 @@ private:
}
catch (runtime_error& e)
{
write_debug("error running command '" + m_buffer + "' : " + e.description());
write_debug("error running command '" + m_buffer + "' : " + e.what());
}
ClientManager::instance().redraw_clients();
close(socket);