mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cover more place methods with place:error

Browse Source
This commit is contained in:
qPCR4vir 2019-05-05 23:05:25 +02:00
parent ca96a9d3ca
commit 4d42409a54
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/gui/place.cpp
View File

@ -3106,8 +3106,8 @@ namespace nana
div->fit = fit; div->fit = fit;
div->fit_parameters = std::move(fit_parameters); div->fit_parameters = std::move(fit_parameters);
} }
catch (place::error& e) { throw; } catch (place::error& ) { throw; }
catch ( error& e) { throw; } catch ( error& ) { throw; }
catch (place_parts::tokenizer::error& e) catch (place_parts::tokenizer::error& e)
{ {
throw error(e.what(), name, e.pos); throw error(e.what(), name, e.pos);
@ -3260,7 +3260,8 @@ namespace nana
void place::bind(window wd) void place::bind(window wd)
{ {
if (impl_->window_handle) if (impl_->window_handle)
throw std::runtime_error("place.bind: it has already bound to a window."); throw error(" bind('"+ API::window_caption(wd).substr(0, 80)
+ "'): it was already bound to another window.", *this);
impl_->window_handle = wd; impl_->window_handle = wd;
impl_->event_size_handle = API::events(wd).resized.connect_unignorable([this](const arg_resized& arg) impl_->event_size_handle = API::events(wd).resized.connect_unignorable([this](const arg_resized& arg)
@ -3299,14 +3300,26 @@ namespace nana
impl_->root_division.swap(div); impl_->root_division.swap(div);
impl_->div_text.swap(div_text); impl_->div_text.swap(div_text);
} }
catch (place::error & ) { throw; }
catch (place::implement::error & e) catch (place::implement::error & e)
{ {
throw place::error("failed to set div('"+div_text+"'): " + e.what(), *this, e.field, e.pos); throw error("failed to set div('" + div_text + "'): " + e.what(), *this, e.field, e.pos);
} }
catch (...) // tokenizer error catch (place_parts::tokenizer::error & e)
{ {
//redefined a name of field throw error("failed to set div('" + div_text + "'): " + e.what(), *this, "", e.pos);
throw; }
catch (std::invalid_argument & e)
{
throw error("failed to set div('" + div_text + "'): " + e.what(), *this);
}
catch (std::exception & e)
{
throw error("failed to set div('"+div_text+"'): unexpected error: " +e.what(), *this );
}
catch (...)
{
throw error("failed to set div('" + div_text + "'): unknonw error", *this);
} }
} }
@ -3385,15 +3398,35 @@ namespace nana
} }
} }
} }
catch (place::error & )
{
replaced->swap(impl_->tmp_replaced);
throw;
}
catch (place::implement::error & e)
{
replaced->swap(impl_->tmp_replaced);
throw error("failed to modify('"+std::string(name) +", "+ div_text + "'): " + e.what(), *this, e.field, e.pos);
}
catch (place_parts::tokenizer::error & e)
{
replaced->swap(impl_->tmp_replaced);
throw error("failed to modify('" + std::string(name) + ", " + div_text + "'): " + e.what(), *this, "", e.pos);
}
catch (std::invalid_argument & e)
{
replaced->swap(impl_->tmp_replaced);
throw error("failed to modify('" + std::string(name) + ", " + div_text + "'): " + e.what(), *this);
}
catch (std::exception & e) catch (std::exception & e)
{ {
replaced->swap(impl_->tmp_replaced); replaced->swap(impl_->tmp_replaced);
throw error( std::string("modify()")+e.what(), *this, name); throw error("failed to modify('" + std::string(name) + ", " + div_text + "'): unexpected error: " + e.what(), *this);
} }
catch (...) catch (...)
{ {
replaced->swap(impl_->tmp_replaced); replaced->swap(impl_->tmp_replaced);
throw error("modify() unknonw error", *this, name); throw error("failed to modify('" + std::string(name) + ", " + div_text + "'): unknonw error", *this);
} }
} }