upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 13:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Output formula errors in unit filters to WML error stream

Browse Source 
(And consider them to match no units)
This commit is contained in:
Celtic Minstrel 2016-02-26 12:49:47 -05:00
parent 26a2638f2c
commit 240b5f61a7
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/test/scenarios/filter_this_unit.cfg
View File

@ -59,7 +59,7 @@
[/event] [/event]
)} )}
{GENERIC_UNIT_TEST filter_this_unit_fai_short ( {GENERIC_UNIT_TEST filter_fai_unit (
[event] [event]
name=prestart name=prestart
[modify_unit] [modify_unit]
@ -76,3 +76,15 @@
)} )}
[/event] [/event]
)} )}
{GENERIC_UNIT_TEST filter_fai_unit_error (
[event]
name=prestart
{RETURN (
[have_unit]
id=bob
formula="+ max_moves"
[/have_unit]
)}
[/event]
)}

15
src/unit_formula_manager.cpp
View File

@ -19,17 +19,24 @@
#include "formula.hpp" #include "formula.hpp"
#include "formula_string_utils.hpp" #include "formula_string_utils.hpp"
#include "map_location.hpp" #include "map_location.hpp"
#include "log.hpp"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
bool unit_formula_manager::matches_filter(const std::string & cfg_formula, const map_location & loc, const unit & me) bool unit_formula_manager::matches_filter(const std::string & cfg_formula, const map_location & loc, const unit & me)
{ {
const unit_callable callable(loc,me); try {
const game_logic::formula form(cfg_formula); const unit_callable callable(loc,me);
if(!form.evaluate(callable).as_bool()) {///@todo use formula_ai const game_logic::formula form(cfg_formula);
if(!form.evaluate(callable).as_bool()) {///@todo use formula_ai
return false;
}
return true;
} catch(game_logic::formula_error& e) {
lg::wml_error << "Formula error in unit filter: " << e.type << " at " << e.filename << ':' << e.line << ")\n";
// Formulae with syntax errors match nothing
return false; return false;
} }
return true;
} }
void unit_formula_manager::add_formula_var(std::string str, variant var) void unit_formula_manager::add_formula_var(std::string str, variant var)

3
wml_test_schedule
View File

@ -147,7 +147,8 @@
0 filter_this_unit_wml 0 filter_this_unit_wml
0 filter_this_unit_tl 0 filter_this_unit_tl
0 filter_this_unit_fai 0 filter_this_unit_fai
0 filter_this_unit_fai_short 0 filter_fai_unit
1 filter_fai_unit_error
# Interrupt tag tests # Interrupt tag tests
0 check_interrupts_break 0 check_interrupts_break
0 check_interrupts_return 0 check_interrupts_return