Redesign GnuLinker to work without subtools

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index a0603cfafc21fba7777a899de24a3c5bcffaa198..1d3b180d47ce41a586739dfb73cd89f8780e7a3d 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,4 +1,5 @@
 #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>
@@ -11,11 +12,6 @@
 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);
@@ -23,7 +19,7 @@ const Config::Option &Config::add_option(const Feature &f)
        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)
@@ -61,7 +57,7 @@ void Config::load()
        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();
@@ -79,11 +75,12 @@ void Config::save() const
 
        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)
-               IO::print(out, "option \"%s\" \"%s\";\n", kvp.second.name, kvp.second.value);
+               writer.write((DataFile::Statement("option"), kvp.second.name, kvp.second.value));
 
        changed = false;
 }