upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 21:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow mixing [literal], [value], and even [split] in [set_variables]

Browse Source
This commit is contained in:
Celtic Minstrel 2015-10-08 14:54:48 -04:00
parent a77fada784
commit 285f8c80e2
2 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/game_events/action_wml.cpp
View File

@ -901,11 +901,6 @@ WML_HANDLER_FUNCTION(set_variables, /*event_info*/, cfg)
return;
}
const vconfig::child_list values = cfg.get_children("value");
const vconfig::child_list literals = cfg.get_children("literal");
const vconfig::child_list split_elements = cfg.get_children("split");
std::vector<config> data;
if(cfg.has_attribute("to_variable"))
{
@ -921,49 +916,48 @@ WML_HANDLER_FUNCTION(set_variables, /*event_info*/, cfg)
{
ERR_NG << "Cannot do [set_variables] with invalid to_variable variable: " << cfg["to_variable"] << " with " << cfg.get_config().debug() << std::endl;
}
} else if(!values.empty()) {
for(vconfig::child_list::const_iterator i=values.begin(); i!=values.end(); ++i)
{
data.push_back((*i).get_parsed_config());
}
} else if(!literals.empty()) {
for(vconfig::child_list::const_iterator i=literals.begin(); i!=literals.end(); ++i)
{
data.push_back(i->get_config());
}
} else if(!split_elements.empty()) {
const vconfig & split_element = split_elements.front();
} else {
typedef std::pair<std::string, vconfig> vchild;
BOOST_FOREACH(const vchild& p, cfg.all_ordered()) {
if(p.first == "value") {
data.push_back(p.second.get_parsed_config());
} else if(p.first == "literal") {
data.push_back(p.second.get_config());
} else if(p.first == "split") {
const vconfig & split_element = p.second;
std::string split_string=split_element["list"];
std::string separator_string=split_element["separator"];
std::string key_name=split_element["key"];
if(key_name.empty())
{
key_name="value";
}
std::string split_string=split_element["list"];
std::string separator_string=split_element["separator"];
std::string key_name=split_element["key"];
if(key_name.empty())
{
key_name="value";
}
bool remove_empty = split_element["remove_empty"].to_bool();
bool remove_empty = split_element["remove_empty"].to_bool();
char* separator = separator_string.empty() ? NULL : &separator_string[0];
char* separator = separator_string.empty() ? NULL : &separator_string[0];
std::vector<std::string> split_vector;
std::vector<std::string> split_vector;
//if no separator is specified, explode the string
if(separator == NULL)
{
for(std::string::iterator i=split_string.begin(); i!=split_string.end(); ++i)
{
split_vector.push_back(std::string(1, *i));
//if no separator is specified, explode the string
if(separator == NULL)
{
for(std::string::iterator i=split_string.begin(); i!=split_string.end(); ++i)
{
split_vector.push_back(std::string(1, *i));
}
}
else {
split_vector=utils::split(split_string, *separator, remove_empty ? utils::REMOVE_EMPTY | utils::STRIP_SPACES : utils::STRIP_SPACES);
}
for(std::vector<std::string>::iterator i=split_vector.begin(); i!=split_vector.end(); ++i)
{
data.push_back(config_of(key_name, *i));
}
}
}
else {
split_vector=utils::split(split_string, *separator, remove_empty ? utils::REMOVE_EMPTY | utils::STRIP_SPACES : utils::STRIP_SPACES);
}
for(std::vector<std::string>::iterator i=split_vector.begin(); i!=split_vector.end(); ++i)
{
data.push_back(config_of(key_name, *i));
}
}
try
{

3
src/variable.hpp
View File

@ -154,6 +154,9 @@ public:
/** In-order iteration over all children. */
all_children_iterator ordered_begin() const;
all_children_iterator ordered_end() const;
std::pair<all_children_iterator,all_children_iterator> all_ordered() const {
return std::make_pair(ordered_begin(), ordered_end());
}
private:
/// Returns true if *this has made a copy of its config.