X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.h;h=a5da2e440b768e50f3fa11f50700e11983f3b2e0;hp=de75d1213e133362417fff8260c8bf38f90853cb;hb=1d0159075e916c738760b788d605b71b3736cb7c;hpb=f57d51b7f3b5d97b7322aa7e4bd9025726a518e3

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