Use std::lexicographical_compare() in UCI options

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index b9c16cd913dab970780fc38f04966f209c388103..c764ac8bb088636cb8b9aec08aa2e39a2d35773a 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,56 +25,60 @@
 #include <map>
 #include <string>
 
-class Option {
+class UCIOption {
 public:
-  Option() {} // To allow insertion in a std::map
-  Option(const char* defaultValue);
-  Option(bool defaultValue, std::string type = "check");
-  Option(int defaultValue, int minValue, int maxValue);
+  UCIOption() {} // To be used in a std::map
+  UCIOption(const char* defaultValue);
+  UCIOption(bool defaultValue, std::string type = "check");
+  UCIOption(int defaultValue, int minValue, int maxValue);
 
   void set_value(const std::string& v);
   template<typename T> T value() const;
 
 private:
-  friend void init_uci_options();
-  friend std::string options_to_uci();
+  friend struct OptionsMap;
 
   std::string defaultValue, currentValue, type;
-  size_t idx;
   int minValue, maxValue;
+  size_t idx;
 };
 
+
+/// Custom comparator because UCI options should be case insensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
+
+
+/// Our options container is actually a map with a customized c'tor
+struct OptionsMap : std::map<std::string, UCIOption, CaseInsensitiveLess> {
+  OptionsMap();
+  std::string print_all() const;
+};
+
+extern OptionsMap Options;
+
+
+/// Option::value() definition and specializations
 template<typename T>
-inline T Option::value() const {
+T UCIOption::value() const {
 
   assert(type == "spin");
   return T(atoi(currentValue.c_str()));
 }
 
 template<>
-inline std::string Option::value<std::string>() const {
+inline std::string UCIOption::value<std::string>() const {
 
   assert(type == "string");
   return currentValue;
 }
 
 template<>
-inline bool Option::value<bool>() const {
+inline bool UCIOption::value<bool>() const {
 
   assert(type == "check" || type == "button");
   return currentValue == "true";
 }
 
-
-// Custom comparator because UCI options should not be case sensitive
-struct CaseInsensitiveLess {
-  bool operator() (const std::string&, const std::string&) const;
-};
-
-typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
-
-extern OptionsMap Options;
-extern void init_uci_options();
-extern std::string options_to_uci();
-
 #endif // !defined(UCIOPTION_H_INCLUDED)