finally fixed broken main loop

[chaz/yoink] / src / Moof / Settings.hh

diff --git a/src/Moof/Settings.hh b/src/Moof/Settings.hh
index 2a2a9267026e5475ddd5c0a1d11433da19767251..6cd86291b64bb1be6ed959b7b4d61745495c08e6 100644 (file)
--- a/src/Moof/Settings.hh
+++ b/src/Moof/Settings.hh
@@ -50,12 +50,10 @@ class Settings
 {
 public:
 
-       Settings() :
-               mGlobals(mScript.getGlobalTable()),
-               mTop(mScript[-1])
+       Settings()
        {
                mScript.importBaseLibrary();
-               importLogPrintFunction(mScript);
+               importLogFunctions(mScript);
        }
 
        ~Settings();
@@ -74,31 +72,33 @@ public:
        void save() const;
 
        template <typename T>
-       bool get(const std::string& key, T& value);
+       bool get(const std::string& key, T& value) const;
 
 private:
 
-       Script                  mScript;
-       Script::Slot    mGlobals, mTop;
+       mutable Script  mScript;
 
        std::string             mUserFile;
 };
 
 
 template <typename T>
-bool Settings::get(const std::string& key, T& value)
+bool Settings::get(const std::string& key, T& value) const
 {
+       Script::Slot top = mScript[-1];
+       Script::Slot globals = mScript.getGlobalTable();
+
        std::vector<std::string> fields;
        boost::split(fields, key, boost::is_any_of("."));
 
-       mGlobals.pushCopy();
+       globals.pushCopy();
 
        std::vector<std::string>::iterator it;
        for (it = fields.begin(); it != fields.end(); ++it)
        {
-               if (mTop.isTable())
+               if (top.isTable())
                {
-                       mTop.pushField(*it);
+                       top.pushField(*it);
                }
                else
                {
@@ -107,7 +107,7 @@ bool Settings::get(const std::string& key, T& value)
                }
        }
 
-       bool got = mTop.get(value);
+       bool got = top.get(value);
        mScript.clear();
        return got;
 }