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

Refactor write_key_val() so that it does not need...

Browse source 
...to access the private data of attribute_value.
This commit is contained in:
J. Tyne 2012-12-13 23:46:35 +00:00
parent bed09e7725
commit 184aee57eb
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.hpp
View file

@ -238,8 +238,6 @@ public:
template <typename V>
typename V::result_type apply_visitor(const V & visitor) const
{ return boost::apply_visitor(visitor, value_); }
friend void write_key_val(std::ostream &, const std::string &, const attribute_value &, unsigned, std::string &);
};
typedef std::map<std::string, attribute_value> attribute_map;

29
src/serialization/parser.cpp
View file

@ -40,7 +40,7 @@
#include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/filter/bzip2.hpp>
#include <boost/iostreams/filter/gzip.hpp>
#include <boost/variant.hpp>
#include <boost/variant/static_visitor.hpp>
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
@ -444,7 +444,7 @@ namespace { // helpers for write_key_val().
struct write_key_val_visitor : boost::static_visitor<void>
{
std::ostream &out_;
unsigned level_;
const unsigned level_;
std::string &textdomain_;
const std::string &key_;
@ -454,20 +454,19 @@ namespace { // helpers for write_key_val().
{}
void operator()(boost::blank const &) const
{ out_ << "\"\""; }
{ indent(); out_ << key_ << '=' << "\"\""; }
void operator()(bool b) const
{ out_ << (b ? "yes" : "no"); }
{ indent(); out_ << key_ << '=' << (b ? "yes" : "no"); }
void operator()(double d) const
{ int i = d; if (d == i) out_ << i; else out_ << d; }
void operator()(size_t s) const
{ out_ << s; }
void operator()(long t) const
{ out_ << t; }
void operator()(int i) const
{ out_ << i; }
{ indent(); out_ << key_ << '=';
int i = d; if (d == i) out_ << i; else out_ << d; }
void operator()(std::string const &s) const
{ out_ << '"' << escaped_string(s) << '"'; }
{ indent(); out_ << key_ << '=' << '"' << escaped_string(s) << '"'; }
void operator()(t_string const &s) const;
private:
void indent() const
{ for ( unsigned i = 0; i < level_; ++i ) out_ << '\t'; }
};
/**
@ -491,7 +490,7 @@ namespace { // helpers for write_key_val().
out_ << "#textdomain " << textdomain_ << '\n';
}
for (unsigned i = 0; i < level_; ++i) out_ << '\t';
indent();
if (first)
out_ << key_ << '=';
@ -511,10 +510,6 @@ void write_key_val(std::ostream &out, const std::string &key,
const config::attribute_value &value, unsigned level,
std::string& textdomain)
{
if (!boost::get<t_string const>(&value.value_)) {
for (unsigned i = 0; i < level; ++i) out << '\t';
out << key << '=';
}
value.apply_visitor(write_key_val_visitor(out, level, textdomain, key));
out << '\n';
}