amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add exception handlers in places where scripts are invoked. This should lead to slightly nicer error messages.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-22 00:30:18 +02:00
parent 8b91cd8804
commit c9c7a958ae
5 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/keywords_panel.cpp
+7 -3
View File
@@ -246,9 +246,13 @@ String KeywordsPanel::runRefScript(int find_i) {
} else {
FOR_EACH(r, p->refer_scripts) {
if (i++ == find_i) {
Context& ctx = set->getContext();
ctx.setVariable(SCRIPT_VAR_input, to_script(param_s));
return r->script.invoke(ctx)->toString();
try {
Context& ctx = set->getContext();
ctx.setVariable(SCRIPT_VAR_input, to_script(param_s));
return r->script.invoke(ctx)->toString();
} catch (ScriptError const& e) {
handle_error(ScriptError(e.what() + _("\n in keyword refer script '") + r->name + _("'")));
}
}
}
}
src/gui/set/stats_panel.cpp
+10 -6
View File
@@ -480,12 +480,16 @@ void StatsPanel::showCategory(const GraphType* prefer_layout) {
GraphElementP e(new GraphElement(i));
bool show = true;
FOR_EACH(dim, dims) {
String value = untag(dim->script.invoke(ctx)->toString());
e->values.push_back(value);
if (value.empty() && !dim->show_empty) {
// don't show this element
show = false;
break;
try {
String value = untag(dim->script.invoke(ctx)->toString());
e->values.push_back(value);
if (value.empty() && !dim->show_empty) {
// don't show this element
show = false;
break;
}
} catch (ScriptError const& e) {
handle_error(ScriptError(e.what() + _("\n in script for statistics dimension '") + dim->name + _("'")));
}
}
if (show) {
src/gui/value/choice.cpp
+6 -2
View File
@@ -229,8 +229,12 @@ size_t DropDownChoiceList::selection() const {
return 0;
} else {
// run default script to find out what the default choice would be
String default_choice = field().default_script.invoke( cve.viewer.getContext() )->toString();
default_id = group->choiceId(default_choice);
try {
String default_choice = field().default_script.invoke( cve.viewer.getContext() )->toString();
default_id = group->choiceId(default_choice);
} catch (ScriptError const& e) {
handle_error(ScriptError(e.what() + _("\n in default script for '") + field().name + _("'")));
}
}
}
// item corresponding to id
src/gui/value/color.cpp
+5 -1
View File
@@ -107,7 +107,11 @@ size_t DropDownColorList::selection() const {
return 0;
} else if (hasDefault()) {
// evaluate script to find default color
default_color = field().default_script.invoke(cve.viewer.getContext())->toColor();
try {
default_color = field().default_script.invoke(cve.viewer.getContext())->toColor();
} catch (ScriptError const& e) {
handle_error(ScriptError(e.what() + _("\n in default script for '") + field().name + _("'")));
}
}
return selection;
}
src/script/script_manager.cpp
+10 -2
View File
@@ -44,8 +44,16 @@ Context& SetScriptContext::getContext(const StyleSheetP& stylesheet) {
ctx.setVariable(SCRIPT_VAR_styling, to_script(&set.stylingDataFor(*stylesheet)));
try {
// perform init scripts, don't use a scope, variables stay bound in the context
set.game ->init_script.invoke(ctx, false);
stylesheet->init_script.invoke(ctx, false);
try {
set.game ->init_script.invoke(ctx, false);
} catch (const ScriptError& e) {
handle_error(ScriptError(e.what() + _("\n in init script for game ") + set.game->name()));
}
try {
stylesheet->init_script.invoke(ctx, false);
} catch (const ScriptError& e) {
handle_error(ScriptError(e.what() + _("\n in init script for stylesheet ") + stylesheet->name()));
}
} catch (const Error& e) {
handle_error(e);
}