X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=74d582e7017ddd62bd7189b10c89faabe96f5d6f;hb=6b84e1f5673888753cbe566c1365222ed33fd3ac;hp=75784e370d19525bef4e391ffd15d80ff873279a;hpb=d9028dec3b81c84560c580008fa68490f049e723;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 75784e3..74d582e 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>
@@ -16,19 +17,21 @@ Config::Config(SourcePackage &p):
 	changed(false)
 { }
 
-void Config::add_option(const string &n, const string &v, const string &d)
+const Config::Option &Config::add_option(const Feature &f)
 {
-	Option opt(n, v, d);
-	if(pending_options.count(n))
-		opt.value = pending_options[n];
-	options.insert(OptionMap::value_type(n, opt));
+	Option opt(f);
+	auto i = pending_options.find(opt.name);
+	if(i!=pending_options.end())
+		opt.value = i->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)
@@ -59,7 +62,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();
@@ -77,20 +80,23 @@ 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;
 }
 
 
-Config::Option::Option(const string &n, const string &v, const string &d):
-	name(n),
-	default_value(v),
-	description(d),
-	value(v)
-{ }
+Config::Option::Option(const Feature &f):
+	Feature(f),
+	value(default_value)
+{
+	name = "with_"+name;
+}
 
 
 Config::Loader::Loader(Config &c):