pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-06-01 16:12:59 +03:00
parent 08b0166a66
commit d95de0e1ec
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/string_utils.cpp
View file

@ -236,6 +236,12 @@ bool IsASCIIString(std::string const & str)
}
bool IsASCIIDigit(UniChar c) { return c >= '0' && c <= '9'; }
bool IsASCIISpace(UniChar c)
{
return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
}
bool IsASCIILatin(UniChar c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); }
bool StartsWith(UniString const & s, UniString const & p)

1
base/string_utils.hpp
View file

@ -88,6 +88,7 @@ UniString MakeUniString(std::string const & utf8s);
std::string ToUtf8(UniString const & s);
bool IsASCIIString(std::string const & str);
bool IsASCIIDigit(UniChar c);
bool IsASCIISpace(UniChar c);
bool IsASCIILatin(UniChar c);
inline std::string DebugPrint(UniString const & s) { return ToUtf8(s); }

10
indexer/search_string_utils.cpp
View file

@ -5,8 +5,6 @@
#include "base/macros.hpp"
#include "base/mem_trie.hpp"
#include <cctype>
using namespace std;
using namespace strings;
@ -29,10 +27,10 @@ void RemoveNumeroSigns(UniString & s)
}
size_t j = i + 1;
while (j < n && isspace(s[j]))
while (j < n && IsASCIISpace(s[j]))
++j;
if (j == n || isdigit(s[j]))
if (j == n || IsASCIIDigit(s[j]))
s[i] = ' ';
i = j;
@ -68,9 +66,9 @@ UniString NormalizeAndSimplifyString(string const & s)
break;
// Some Danish-specific hacks.
case 0x00d8: // Ø
case 0x00f8:
case 0x00f8: // ø
c = 'o';
break; // ø
break;
case 0x0152: // Œ
case 0x0153: // œ
c = 'o';