along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm>
#include <cctype>
#include <iostream>
#include <sstream>
// 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++]);
+static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
- if (c1 != c2)
- return c1 < c2;
- }
- return s1.size() < s2.size();
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
template<typename T> T value() const;
private:
- friend class OptionsMap;
+ friend struct OptionsMap;
std::string defaultValue, currentValue, type;
int minValue, maxValue;
};
-/// Custom comparator because UCI options should not be case sensitive
+/// 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
-class OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
-public:
+struct OptionsMap : std::map<std::string, UCIOption, CaseInsensitiveLess> {
OptionsMap();
std::string print_all() const;
};