#include <msp/core/maputils.h>
+#include <msp/datafile/writer.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/file.h>
using namespace std;
using namespace Msp;
-Config::Config(SourcePackage &p):
- package(p),
- changed(false)
-{ }
-
const Config::Option &Config::add_option(const Feature &f)
{
Option opt(f);
- InputOptions::const_iterator i = pending_options.find(opt.name);
+ auto i = pending_options.find(opt.name);
if(i!=pending_options.end())
opt.value = i->second;
- return options.insert(OptionMap::value_type(opt.name, opt)).first->second;
+ return options.insert({ opt.name, opt }).first->second;
}
bool Config::set_option(const string &opt, const string &val)
{
bool result = false;
- OptionMap::iterator i = options.find(opt);
+ auto i = options.find(opt);
if(i!=options.end())
{
if(i->second.value!=val)
FS::Stat stat = FS::stat(fn);
if(stat)
{
- package.get_builder().get_logger().log("files", format("Reading %s", fn));
+ package.get_builder().get_logger().log("files", "Reading %s", fn);
IO::BufferedFile in(fn.str());
mtime = stat.get_modify_time();
FS::Path fn = package.get_source_directory()/".config";
- package.get_builder().get_logger().log("files", format("Writing %s", fn));
+ package.get_builder().get_logger().log("files", "Writing %s", fn);
IO::BufferedFile out(fn.str(), IO::M_WRITE);
+ DataFile::Writer writer(out);
+
+ for(const auto &kvp: options)
+ writer.write((DataFile::Statement("option"), kvp.second.name, kvp.second.value));
- for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
- IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+ changed = false;
}