kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Use std::lexicographical_compare() in UCI options

Browse source 
Instead of our home grown function to perform a case
insensitive compare on option names as required by UCI
protocol.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-08-03 14:24:55 +01:00
parent 1e7c6fc761
commit 3a76163aba
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/ucioption.cpp
View file

@ -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 <algorithm>
#include <cctype> #include <cctype>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -33,20 +34,10 @@ OptionsMap Options; // Global object
// Our case insensitive less() function as required by UCI protocol // Our case insensitive less() function as required by UCI protocol
static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
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();
} }

7
src/ucioption.h
View file

@ -36,7 +36,7 @@ public:
template<typename T> T value() const; template<typename T> T value() const;
private: private:
friend class OptionsMap; friend struct OptionsMap;
std::string defaultValue, currentValue, type; std::string defaultValue, currentValue, type;
int minValue, maxValue; int minValue, maxValue;
@ -44,15 +44,14 @@ private:
}; };
/// Custom comparator because UCI options should not be case sensitive /// Custom comparator because UCI options should be case insensitive
struct CaseInsensitiveLess { struct CaseInsensitiveLess {
bool operator() (const std::string&, const std::string&) const; bool operator() (const std::string&, const std::string&) const;
}; };
/// Our options container is actually a map with a customized c'tor /// Our options container is actually a map with a customized c'tor
class OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> { struct OptionsMap : std::map<std::string, UCIOption, CaseInsensitiveLess> {
public:
OptionsMap(); OptionsMap();
std::string print_all() const; std::string print_all() const;
}; };