X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=1d3b180d47ce41a586739dfb73cd89f8780e7a3d;hb=40ab4f61eaf7fc14fc6d1c2ea5eecee21882893a;hp=69abe9d0b51b929d84a50ee08f3e9d7ef2bbb673;hpb=153372211c242e539754680b5fe979e3be61ebfe;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 69abe9d..1d3b180 100644
--- 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,26 +12,21 @@
 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)
@@ -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,14 @@ 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)
+		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;
 }