Use std::lexicographical_compare() in UCI options

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index e9f4b15896586f15c518c791e70e248efd7ae9cb..c764ac8bb088636cb8b9aec08aa2e39a2d35773a 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-2009 Marco Costalba
+  Copyright (C) 2008-2010 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,68 @@
   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 {
+public:
+  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 struct OptionsMap;
+
+  std::string defaultValue, currentValue, type;
+  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;
+
 
-////
-//// Variables
-////
+/// Option::value() definition and specializations
+template<typename T>
+T UCIOption::value() const {
 
-extern bool Chess960;
+  assert(type == "spin");
+  return T(atoi(currentValue.c_str()));
+}
 
+template<>
+inline std::string UCIOption::value<std::string>() const {
 
-////
-//// Prototypes
-////
+  assert(type == "string");
+  return currentValue;
+}
 
-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);
+template<>
+inline bool UCIOption::value<bool>() const {
 
+  assert(type == "check" || type == "button");
+  return currentValue == "true";
+}
 
 #endif // !defined(UCIOPTION_H_INCLUDED)