Refuse to create an empty data pack

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index a0603cfafc21fba7777a899de24a3c5bcffaa198..4e57fdfbbc70e6f8afbbef45f866f2ac94b5b3bb 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>
@@ -23,7 +24,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)
@@ -81,9 +82,10 @@ void Config::save() const
 
        package.get_builder().get_logger().log("files", format("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;
 }