Changeset 1143 for trunk

Timestamp:

Jul 24, 2010, 5:05:34 AM (11 years ago)

Author:

Peter Johansson

Message:

be entirely case-insensitive when checking boolean variables in config file, and allow on/off and 1/0 values

Location:

trunk/lib

Files:

• Configuration.cc (modified) (2 diffs)
• Configuration.h (modified) (1 diff)

trunk/lib/Configuration.cc

@@ -27 +27 @@
 #include "Functor.h"
 
+#include <algorithm>
 #include <cassert>
 #include <fstream>
@@ -109 +110 @@
 
 
-  bool Configuration::equal_false(const std::string& str) const
-  {
-    return str=="false" || str=="False" || str=="FALSE" ||
-      str=="no" || str=="No" || str=="NO";
-  }
-
-
-  bool Configuration::equal_true(const std::string& str) const
-  {
-    return str=="true" || str=="True" || str=="TRUE" ||
-      str=="yes" || str=="Yes" || str=="YES";
+  bool Configuration::equal_false(std::string str) const
+  {
+    transform(str.begin(), str.end(), str.begin(), tolower);
+    return str=="false" || str=="no" || str=="off" || str=="0";
+  }
+
+
+  bool Configuration::equal_true(std::string str) const
+  {
+    transform(str.begin(), str.end(), str.begin(), tolower);
+    return str=="true" || str=="yes" || str=="on" || str=="1";
   }
 

trunk/lib/Configuration.h

@@ -140 +140 @@
     void clear(void);
     const std::pair<std::string,std::string>* dictionary(std::string lhs) const;
-    bool equal_false(const std::string&) const;
-    bool equal_true(const std::string&) const;
+    bool equal_false(std::string) const;
+    bool equal_true(std::string) const;
     /// 
     /// @brief load deafult configuration