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

AnimationWML: add warning for mismatched leading zero paddings in square bracket expansions.

Browse source
This commit is contained in:
David Mikos 2014-02-15 08:16:41 +10:30
parent 8a1ff1eca2
commit 60fe06b02e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/serialization/string_utils.cpp
View file

@ -210,18 +210,22 @@ std::vector< std::string > square_parenthetical_split(std::string const &val,
std::string s_begin = (*itor).substr(0,found_tilde);
s_begin = strip(s_begin);
int begin = atoi(s_begin.c_str());
size_t padding = 0;
size_t padding = 0, padding_end = 0;
while (padding<s_begin.size() && s_begin[padding]=='0') {
padding++;
}
std::string s_end = (*itor).substr(found_tilde+1);
s_end = strip(s_end);
int end = atoi(s_end.c_str());
if (padding==0) {
while (padding<s_end.size() && s_end[padding]=='0') {
padding++;
}
while (padding_end<s_end.size() && s_end[padding_end]=='0') {
padding_end++;
}
if (padding*padding_end > 0 && s_begin.size() != s_end.size()) {
ERR_GENERAL << "Square bracket padding sizes not matching: "
<< s_begin << " and " << s_end <<".\n";
}
if (padding_end > padding) padding = padding_end;
int increment = (end >= begin ? 1 : -1);
end+=increment; //include end in expansion
for (int k=begin; k!=end; k+=increment) {