mirror of
https://github.com/sockspls/badfish
synced 2025-04-29 16:23:09 +00:00
UCI options names should not be case sensitive
Correctly handle uci option names in a case insensitive way. Alos fix some indentation while there. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
f44aea7508
commit
85df24624a
2 changed files with 33 additions and 8 deletions
|
@ -17,6 +17,7 @@
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <cctype>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
|
@ -28,7 +29,25 @@ using std::string;
|
||||||
using std::cout;
|
using std::cout;
|
||||||
using std::endl;
|
using std::endl;
|
||||||
|
|
||||||
OptionsMap Options;
|
OptionsMap Options; // Global object
|
||||||
|
|
||||||
|
|
||||||
|
// Our case insensitive less() function as required by UCI protocol
|
||||||
|
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
|
||||||
|
|
||||||
|
int c1, c2;
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
while (i < s1.size() && i < s2.size())
|
||||||
|
{
|
||||||
|
c1 = tolower(s1[i]);
|
||||||
|
c2 = tolower(s2[i++]);
|
||||||
|
|
||||||
|
if (c1 != c2)
|
||||||
|
return c1 < c2;
|
||||||
|
}
|
||||||
|
return s1.size() < s2.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// stringify() converts a numeric value of type T to a std::string
|
// stringify() converts a numeric value of type T to a std::string
|
||||||
|
|
|
@ -47,25 +47,31 @@ private:
|
||||||
template<typename T>
|
template<typename T>
|
||||||
inline T Option::value() const {
|
inline T Option::value() const {
|
||||||
|
|
||||||
assert(type == "spin");
|
assert(type == "spin");
|
||||||
return T(atoi(currentValue.c_str()));
|
return T(atoi(currentValue.c_str()));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
inline std::string Option::value<std::string>() const {
|
inline std::string Option::value<std::string>() const {
|
||||||
|
|
||||||
assert(type == "string");
|
assert(type == "string");
|
||||||
return currentValue;
|
return currentValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
inline bool Option::value<bool>() const {
|
inline bool Option::value<bool>() const {
|
||||||
|
|
||||||
assert(type == "check" || type == "button");
|
assert(type == "check" || type == "button");
|
||||||
return currentValue == "true";
|
return currentValue == "true";
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef std::map<std::string, Option> OptionsMap;
|
|
||||||
|
// Custom comparator because UCI options should not be case sensitive
|
||||||
|
struct CaseInsensitiveLess {
|
||||||
|
bool operator() (const std::string&, const std::string&) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
|
||||||
|
|
||||||
extern OptionsMap Options;
|
extern OptionsMap Options;
|
||||||
extern void init_uci_options();
|
extern void init_uci_options();
|
||||||
|
|
Loading…
Add table
Reference in a new issue