Retire struct OptionsMap

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 6c9812189744a5bd93cf0fbc9915360019917433..b78bf6fdf4c4108f6edc97b2cfeadb37737f7092 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,56 +25,50 @@
 #include <map>
 #include <string>
 
-class Option {
-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);
-
-  void set_value(const std::string& value);
-  template<typename T> T value() const;
+class UCIOption;
 
-private:
-  friend void init_uci_options();
-  friend void print_uci_options();
-
-  std::string defaultValue, currentValue, type;
-  size_t idx;
-  int minValue, maxValue;
+/// Custom comparator because UCI options should be case insensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
 };
 
-template<typename T>
-inline T Option::value() const {
+/// Our options container is actually a std::map
+typedef std::map<std::string, UCIOption, CaseInsensitiveLess> OptionsMap;
 
-  assert(type == "spin");
-  return T(atoi(currentValue.c_str()));
-}
+/// UCIOption class implements an option as defined by UCI protocol
+class UCIOption {
 
-template<>
-inline std::string Option::value<std::string>() const {
+  typedef void (Fn)(const UCIOption&);
 
-  assert(type == "string");
-  return currentValue;
-}
+public:
+  UCIOption(Fn* = NULL);
+  UCIOption(bool v, Fn* = NULL);
+  UCIOption(const char* v, Fn* = NULL);
+  UCIOption(int v, int min, int max, Fn* = NULL);
 
-template<>
-inline bool Option::value<bool>() const {
+  UCIOption& operator=(const std::string& v);
 
-  assert(type == "check" || type == "button");
-  return currentValue == "true";
-}
+  operator int() const {
+    assert(type == "check" || type == "spin");
+    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+  }
 
+  operator std::string() const {
+    assert(type == "string");
+    return currentValue;
+  }
 
-// Custom comparator because UCI options should not be case sensitive
-struct CaseInsensitiveLess {
-  bool operator() (const std::string&, const std::string&) const;
-};
+private:
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
-typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
+  std::string defaultValue, currentValue, type;
+  int min, max;
+  size_t idx;
+  Fn* on_change;
+};
 
 extern OptionsMap Options;
-extern void init_uci_options();
-extern void print_uci_options();
+
+namespace UCIOptions { void init(OptionsMap&); }
 
 #endif // !defined(UCIOPTION_H_INCLUDED)