0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Schema: Accept [elseif] in [if] and change [switch][default] to [else]

Browse source
This commit is contained in:
Celtic Minstrel 2018-03-27 23:05:40 -04:00
parent 6e2ed5f53f
commit efa30b3840
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/schema/units/modifications.cfg
View file

@ -209,10 +209,10 @@
{SIMPLE_KEY types string_list}
{SIMPLE_KEY amlas string_list}
[/case]
[default]
[else]
any_tag=yes
{ANY_KEY string}
[/default]
[/else]
[/switch]
{WML_MERGE_KEYS}
[/tag]

24
src/serialization/tag.cpp
View file

@ -513,24 +513,36 @@ void class_tag::add_switch(const config& switch_cfg)
const std::string name = formatter() << get_name() << '[' << key << '=' << case_cfg["value"] << ']';
conditions_.back().set_name(name);
}
if(switch_cfg.has_child("default")) {
conditions_.emplace_back(switch_cfg.child("default"), default_cfg);
const std::string name = formatter() << get_name() << "[default]";
if(switch_cfg.has_child("else")) {
conditions_.emplace_back(switch_cfg.child("else"), default_cfg);
const std::string name = formatter() << get_name() << "[else]";
conditions_.back().set_name(name);
}
}
void class_tag::add_filter(const config& cond_cfg)
{
config filter = cond_cfg;
filter.clear_children("then", "else");
config filter = cond_cfg, else_filter;
filter.clear_children("then", "else", "elseif");
// Note in case someone gets trigger-happy:
// DO NOT MOVE THIS! It needs to be copied!
else_filter.add_child("not", filter);
if(cond_cfg.has_child("then")) {
conditions_.emplace_back(cond_cfg.child("then"), filter);
const std::string name = formatter() << get_name() << "[then]";
conditions_.back().set_name(name);
}
int i = 1;
for(auto elseif_cfg : cond_cfg.child_range("elseif")) {
config elseif_filter = elseif_cfg;
elseif_filter.clear_children("then");
conditions_.emplace_back(elseif_cfg.child("then"), elseif_filter);
else_filter.add_child("not", elseif_filter);
const std::string name = formatter() << get_name() << "[elseif " << i++ << "]";
conditions_.back().set_name(name);
}
if(cond_cfg.has_child("else")) {
conditions_.emplace_back(cond_cfg.child("else"), config{"not", filter});
conditions_.emplace_back(cond_cfg.child("else"), else_filter);
const std::string name = formatter() << get_name() << "[else]";
conditions_.back().set_name(name);
}