wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

Convert Settings to the new config system

Browse source 
This makes all config options self-documenting.

Unknown or unparseable config settings and --option flags now cause a
warning.
This commit is contained in:
Eelco Dolstra 2017-04-13 20:53:23 +02:00
parent 6bd9576aeb
commit ba9ad29fdb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
18 changed files with 348 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libutil/config.hh
View file

@ -47,11 +47,13 @@ public:
void set(const std::string & name, const std::string & value);
void add(AbstractSetting * setting);
void addSetting(AbstractSetting * setting);
void warnUnused();
void warnUnknownSettings();
std::string dump();
StringMap getSettings();
void applyConfigFile(const Path & path, bool fatal = false);
};
class AbstractSetting
@ -83,10 +85,15 @@ protected:
virtual void set(const std::string & value) = 0;
virtual std::string to_string() = 0;
bool parseBool(const std::string & str);
std::string printBool(bool b);
};
struct DefaultSettingTag { };
/* A setting of type T. */
template<typename T>
template<typename T, typename Tag = DefaultSettingTag>
class Setting : public AbstractSetting
{
protected:
@ -103,10 +110,12 @@ public:
: AbstractSetting(name, description, aliases)
, value(def)
{
options->add(this);
options->addSetting(this);
}
operator const T &() const { return value; }
operator T &() { return value; }
const T & get() const { return value; }
bool operator ==(const T & v2) const { return value == v2; }
bool operator !=(const T & v2) const { return value != v2; }
void operator =(const T & v) { value = v; }
@ -123,6 +132,9 @@ std::ostream & operator <<(std::ostream & str, const Setting<T> & opt)
return str;
}
template<typename T>
bool operator ==(const T & v1, const Setting<T> & v2) { return v1 == (const T &) v2; }
/* A special setting for Paths. These are automatically canonicalised
(e.g. "/foo//bar/" becomes "/foo/bar"). */
class PathSetting : public Setting<Path>