X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.hh;h=dc29deb3ad260e772348bd8c40abe7e080a271c4;hp=9c29007613f90d6b35a7c8500208581dae05a5a5;hb=ca0f7bdfba63140dca0bd20586d31980f3938eb2;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index 9c29007..dc29deb 100644
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -34,68 +34,70 @@
  * Load, store, save program settings.
  */
 
-#include <map>
 #include <string>
+#include <vector>
 
-#include <Moof/Singleton.hh>
-#include <Moof/Serializable.hh>
+#include <boost/algorithm/string.hpp>
+
+#include <Moof/Log.hh>
+#include <Moof/Script.hh>
 
 
 namespace Mf {
 
 
-class Settings : public Singleton<Settings>
+class Settings
 {
 public:
-	Settings() {}
-	Settings(int argc, char* argv[]);
+	Settings() :
+		globals_(script_.getGlobalTable()),
+		top_(script_[-1])
+	{
+		importLogScript(script_);
+	}
+
+	// get global instance
+	static Settings& getInstance();
 
 	void parseArgs(int argc, char* argv[]);
 
-	void loadFromFile(const std::string& filePath, bool precedence = false);
-	void loadFromFiles(const std::vector<std::string>& filePaths,
-			bool precedence = false);
+	void loadFromFile(const std::string& filePath);
+	void loadFromFiles(const std::vector<std::string>& filePaths);
 
 	template <typename T>
 	bool get(const std::string& key, T& value);
-	template <typename T>
-	bool getNumber(const std::string& key, T& value);
 
 private:
-	std::map<std::string,SerializablePtr> map_;
+	Script			script_;
+	Script::Value	globals_, top_;
 };
 
 
 template <typename T>
 bool Settings::get(const std::string& key, T& value)
 {
-	std::map<std::string,SerializablePtr>::const_iterator it = map_.find(key);
-
-	if (it != map_.end())
-	{
-		SerializablePtr obj = (*it).second;
-		return obj->get(value);
-	}
-	else
-	{
-		return false;
-	}
-}
+	std::vector<std::string> fields;
+	boost::split(fields, key, boost::is_any_of("."));
 
-template <typename T>
-bool Settings::getNumber(const std::string& key, T& value)
-{
-	std::map<std::string,SerializablePtr>::const_iterator it = map_.find(key);
+	globals_.pushCopy();
 
-	if (it != map_.end())
-	{
-		SerializablePtr obj = (*it).second;
-		return obj->getNumber(value);
-	}
-	else
+	std::vector<std::string>::iterator it;
+	for (it = fields.begin(); it != fields.end(); ++it)
 	{
-		return false;
+		if (top_.isTable())
+		{
+			top_.pushField(*it);
+		}
+		else
+		{
+			script_.clear();
+			return false;
+		}
 	}
+
+	bool got = top_.get(value);
+	script_.clear();
+	return got;
 }