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

Revert "When writing WML, output preprocessor-safe strings"

Browse source 
This reverts commit 20551f4dfc.

It turns out that this breaks simple_wml, so even though it's an improvement for
offline serialization, it can't be done at this time.
This commit is contained in:
Celtic Minstrel 2021-08-29 19:15:35 -04:00
parent fe2fba1e2f
commit 47bff304fc
1 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/serialization/parser.cpp
View file

@ -557,43 +557,7 @@ public:
void operator()(const std::string& s) const
{
indent();
out_ << key_ << '=';
if(s.find("{") == std::string::npos) {
out_ << '"' << escaped_string(s) << '"' << '\n';
} else if(s.find(">>") == std::string::npos) {
out_ << "<<" << s << ">>" << '\n';
} else {
for(size_t i = 0, brace = s.find("{"); i < s.size(); brace = s.find("{", i + 1)) {
out_ << '"' << escaped_string(s.substr(i, brace - i)) << '"';
if(brace == std::string::npos) break;
out_ << "<<" << s[brace];
// Now go until the matching closing brace
size_t brace_nesting = 1;
bool in_shift = false;
for(i = brace + 1; brace_nesting > 0 && i < s.size(); i++) {
if(in_shift) {
if(s[i] == '>') {
out_ << R"""(>>">>"<<)""";
} else {
out_ << s[i-1];
}
in_shift = false;
continue;
}
if(s[i] == '{') {
brace_nesting++;
} else if(s[i] == '}') {
brace_nesting--;
} else if(s[i] == '>') {
in_shift = true;
continue;
}
out_ << s[i];
}
out_ << ">>";
}
out_ << '\n';
}
out_ << key_ << '=' << '"' << escaped_string(s) << '"' << '\n';
}
void operator()(const t_string& s) const;