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

Slightly more information on script errors in keyword reminder text

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@930 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-01 00:50:51 +00:00
parent 7845b9ef81
commit 97ccf34dce
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyword.cpp
+6 -1
View File
@@ -591,7 +591,12 @@ String KeywordDatabase::expand(const String& text,
// Combine keyword & reminder with result // Combine keyword & reminder with result
if (expand) { if (expand) {
String reminder = kw->reminder.invoke(ctx)->toString(); String reminder;
try {
reminder = kw->reminder.invoke(ctx)->toString();
} catch (const Error& e) {
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw->keyword), true, false);
}
ctx.setVariable(_("keyword"), to_script(total)); ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder)); ctx.setVariable(_("reminder"), to_script(reminder));
result += _("<kw-"); result += expand_type; result += _(">"); result += _("<kw-"); result += expand_type; result += _(">");
src/script/functions/basic.cpp
+5 -1
View File
@@ -335,7 +335,11 @@ SCRIPT_RULE_2_N_DEP(expand_keywords, ScriptValueP, _("default expand"), default_
} }
SCRIPT_OPTIONAL_PARAM_C_(CardP, card); SCRIPT_OPTIONAL_PARAM_C_(CardP, card);
WITH_DYNAMIC_ARG(keyword_usage_statistics, card ? &card->keyword_usage : nullptr); WITH_DYNAMIC_ARG(keyword_usage_statistics, card ? &card->keyword_usage : nullptr);
SCRIPT_RETURN(db.expand(input, default_expand, combine, ctx)); try {
SCRIPT_RETURN(db.expand(input, default_expand, combine, ctx));
} catch (const Error& e) {
throw ScriptError(_ERROR_2_("in function", e.what(), _("expand_keywords")));
}
} }
SCRIPT_RULE_2_DEPENDENCIES(expand_keywords) { SCRIPT_RULE_2_DEPENDENCIES(expand_keywords) {
default_expand->dependencies(ctx, dep); default_expand->dependencies(ctx, dep);