Better encapsulation of config inside Package

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index e5c90de0ce597f5bb14607a0f0b0e49481682202..2767f8263a827a67693ee18376d605e842077530 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -6,13 +6,19 @@
 #include <msp/parser/loader.h>
 #include <msp/path/path.h>
 #include <msp/time/timestamp.h>
-#include "option.h"
 
 typedef std::map<std::string, std::string> RawOptionMap;
 
+/**
+Manages configuration for a package.  A configuration may have an arbitary
+amount of options, as well as a modification time (mtime).
+*/
 class Config
 {
 public:
+       /**
+       A single configuration option.
+       */
        struct Option
        {
                std::string name;
@@ -26,17 +32,31 @@ public:
 
        void add_option(const std::string &, const std::string &, const std::string &);
        const Option &get_option(const std::string &) const;
+       const OptionMap &get_options() const          { return options; }
        const Msp::Time::TimeStamp &get_mtime() const { return mtime; }
        bool is_option(const std::string &) const;
-       bool process(const RawOptionMap &);
-       void load(const Msp::Path::Path &); 
+       void select_last_profile();
+       void select_profile(const std::string &);
+       bool update(const RawOptionMap &);
+       void set_source(const Msp::Path::Path &s)     { source=s; }
+       void save() const;
 private:
        class Loader: public Msp::Parser::Loader
        {
+       public:
+               Loader(Config &);
+       private:
+               Config &conf;
+               
+               void option(const std::string &, const std::string &);
        };
        
-       OptionMap options;
+       Msp::Path::Path source;
+       OptionMap       options;
        Msp::Time::TimeStamp mtime;
+
+       bool set_option(const std::string &, const std::string &);
+       void load();
 };
 
 #endif