Wait for main thread to finish before to exit

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 6c9812189744a5bd93cf0fbc9915360019917433..f0787132a7f68104d3804987ef638accd821788e 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,56 +25,50 @@
 #include <map>
 #include <string>
 
-class Option {
+struct OptionsMap;
+
+/// UCIOption class implements an option as defined by UCI protocol
+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() {} // Required by std::map::operator[]
+  UCIOption(const char* v);
+  UCIOption(bool v, std::string type = "check");
+  UCIOption(int v, int min, int max);
+
+  void operator=(const std::string& v);
+  void operator=(bool v) { *this = std::string(v ? "true" : "false"); }
+
+  operator int() const {
+    assert(type == "check" || type == "button" || type == "spin");
+    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+  }
 
-  void set_value(const std::string& value);
-  template<typename T> T value() const;
+  operator std::string() const {
+    assert(type == "string");
+    return currentValue;
+  }
 
 private:
-  friend void init_uci_options();
-  friend void print_uci_options();
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
   std::string defaultValue, currentValue, type;
+  int min, max;
   size_t idx;
-  int minValue, maxValue;
 };
 
-template<typename T>
-inline T Option::value() const {
-
-  assert(type == "spin");
-  return T(atoi(currentValue.c_str()));
-}
-
-template<>
-inline std::string Option::value<std::string>() const {
-
-  assert(type == "string");
-  return currentValue;
-}
 
-template<>
-inline bool Option::value<bool>() const {
-
-  assert(type == "check" || type == "button");
-  return currentValue == "true";
-}
-
-
-// Custom comparator because UCI options should not be case sensitive
+/// Custom comparator because UCI options should be case insensitive
 struct CaseInsensitiveLess {
   bool operator() (const std::string&, const std::string&) const;
 };
 
-typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
 
+/// Our options container is actually a map with a customized c'tor
+struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
+  OptionsMap();
+};
+
+extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
 extern OptionsMap Options;
-extern void init_uci_options();
-extern void print_uci_options();
 
 #endif // !defined(UCIOPTION_H_INCLUDED)