Retire struct OptionsMap

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index bc48d6e8d25d00e9f9ec2d2ccba7ed0e96957b6b..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 Marco Costalba
+  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
@@ -17,37 +17,58 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(UCIOPTION_H_INCLUDED)
 #define UCIOPTION_H_INCLUDED
 
-////
-//// Includes
-////
-
+#include <cassert>
+#include <cstdlib>
+#include <map>
 #include <string>
 
+class UCIOption;
+
+/// 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 std::map
+typedef std::map<std::string, UCIOption, CaseInsensitiveLess> OptionsMap;
+
+/// UCIOption class implements an option as defined by UCI protocol
+class UCIOption {
+
+  typedef void (Fn)(const UCIOption&);
+
+public:
+  UCIOption(Fn* = NULL);
+  UCIOption(bool v, Fn* = NULL);
+  UCIOption(const char* v, Fn* = NULL);
+  UCIOption(int v, int min, int max, Fn* = NULL);
+
+  UCIOption& operator=(const std::string& v);
 
-////
-//// Variables
-////
+  operator int() const {
+    assert(type == "check" || type == "spin");
+    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+  }
 
-extern bool Chess960;
+  operator std::string() const {
+    assert(type == "string");
+    return currentValue;
+  }
 
+private:
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
-////
-//// Prototypes
-////
+  std::string defaultValue, currentValue, type;
+  int min, max;
+  size_t idx;
+  Fn* on_change;
+};
 
-extern void init_uci_options();
-extern void print_uci_options();
-extern bool get_option_value_bool(const std::string &optionName);
-extern int get_option_value_int(const std::string &optionName);
-extern const std::string get_option_value_string(const std::string &optionName);
-extern bool button_was_pressed(const std::string &buttonName);
-extern void set_option_value(const std::string &optionName,
-                             const std::string &newValue);
-extern void push_button(const std::string &buttonName);
+extern OptionsMap Options;
 
+namespace UCIOptions { void init(OptionsMap&); }
 
 #endif // !defined(UCIOPTION_H_INCLUDED)