Use default member initializers and constructor delegation

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 50e0de9f9a165bfd9e461c6d8a194e1a756c316c..48864a9fac64f8fb33d7f4143acac3cb1a27c5ba 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,21 +1,48 @@
-#include <msp/error.h>
+#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>
+#include <msp/io/print.h>
+#include <msp/time/utils.h>
+#include "builder.h"
 #include "config.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-void Config::add_option(const string &n, const string &v, const string &d)
+Config::Config(SourcePackage &p):
+       package(p)
+{ }
+
+const Config::Option &Config::add_option(const Feature &f)
 {
-       options.insert(OptionMap::value_type(n, Option(n, v, d)));
+       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;
 }
 
-const Config::Option &Config::get_option(const string &name) const
+bool Config::set_option(const string &opt, const string &val)
 {
-       OptionMap::const_iterator i=options.find(name);
-       if(i==options.end())
-               throw Exception("Tried to access nonexistent option "+name);
+       bool result = false;
+
+       auto i = options.find(opt);
+       if(i!=options.end())
+       {
+               if(i->second.value!=val)
+               {
+                       result = true;
+                       changed = true;
+                       mtime = Time::now();
+               }
+               i->second.value = val;
+       }
 
-       return i->second;
+       return result;
 }
 
 bool Config::is_option(const string &name) const
@@ -23,26 +50,64 @@ bool Config::is_option(const string &name) const
        return options.count(name);
 }
 
-bool Config::process(const RawOptionMap &opts)
+const Config::Option &Config::get_option(const string &name) const
+{
+       return get_item(options, name);
+}
+
+void Config::load()
 {
-       bool changed=false;
-       for(RawOptionMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+       FS::Path fn = package.get_source_directory()/".config";
+       FS::Stat stat = FS::stat(fn);
+       if(stat)
        {
-               OptionMap::iterator j=options.find(i->first);
-               if(j!=options.end())
-               {
-                       if(i->second!=j->second.value)
-                               changed=true;
-                       j->second.value=i->second;
-               }
+               package.get_builder().get_logger().log("files", "Reading %s", fn);
+               IO::BufferedFile in(fn.str());
+
+               mtime = stat.get_modify_time();
+
+               DataFile::Parser parser(in, fn.str());
+               Loader loader(*this);
+               loader.load(parser);
        }
+}
+
+void Config::save() const
+{
+       if(!changed)
+               return;
+
+       FS::Path fn = package.get_source_directory()/".config";
+
+       package.get_builder().get_logger().log("files", "Writing %s", fn);
+       IO::BufferedFile out(fn.str(), IO::M_WRITE);
+       DataFile::Writer writer(out);
 
-       return changed;
+       for(const auto &kvp: options)
+               writer.write((DataFile::Statement("option"), kvp.second.name, kvp.second.value));
+
+       changed = false;
 }
 
-Config::Option::Option(const string &n, const string &v, const string &d):
-       name(n),
-       defv(v),
-       descr(d),
-       value(v)
-{ }
+
+Config::Option::Option(const Feature &f):
+       Feature(f),
+       value(default_value)
+{
+       name = "with_"+name;
+}
+
+
+Config::Loader::Loader(Config &c):
+       DataFile::ObjectLoader<Config>(c)
+{
+       add("option", &Loader::option);
+}
+
+void Config::Loader::option(const string &n, const string &v)
+{
+       if(obj.options.count(n))
+               obj.set_option(n, v);
+       else
+               obj.pending_options[n] = v;
+}