bionic code removal. Merge from https://android-git.corp.google.com/g/#change,49461 .
Change-Id: I9448ad4ee8bf566c830cdef0df907f1695cfb409main
parent
6874267be0
commit
6d0c954baf
|
@ -14,7 +14,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
namespace latinime {
|
namespace latinime {
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ struct LatinCapitalSmallPair {
|
||||||
//
|
//
|
||||||
// 1. Run the following code. Bascially taken from
|
// 1. Run the following code. Bascially taken from
|
||||||
// Dictionary::toLowerCase(unsigned short c) in dictionary.cpp.
|
// Dictionary::toLowerCase(unsigned short c) in dictionary.cpp.
|
||||||
// Then, get the list of chars where ccc != ccc2 above.
|
// Then, get the list of chars where cc != ccc.
|
||||||
//
|
//
|
||||||
// unsigned short c, cc, ccc, ccc2;
|
// unsigned short c, cc, ccc, ccc2;
|
||||||
// for (c = 0; c < 0xFFFF ; c++) {
|
// for (c = 0; c < 0xFFFF ; c++) {
|
||||||
|
@ -882,25 +882,18 @@ static const struct LatinCapitalSmallPair SORTED_CHAR_MAP[] = {
|
||||||
{ 0xFF3A, 0xFF5A } // FULLWIDTH LATIN CAPITAL LETTER Z
|
{ 0xFF3A, 0xFF5A } // FULLWIDTH LATIN CAPITAL LETTER Z
|
||||||
};
|
};
|
||||||
|
|
||||||
unsigned short latin_tolower(unsigned short c0) {
|
static int compare_pair_capital(const void *a, const void *b) {
|
||||||
const struct LatinCapitalSmallPair *p;
|
return (int)(*(unsigned short *)a)
|
||||||
const struct LatinCapitalSmallPair *base = SORTED_CHAR_MAP;
|
- (int)((struct LatinCapitalSmallPair*)b)->capital;
|
||||||
int c = c0;
|
|
||||||
int lim, cmp;
|
|
||||||
const size_t nmemb = sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]);
|
|
||||||
|
|
||||||
// Binary search: Taken from bionic
|
|
||||||
for (lim = nmemb; lim != 0; lim >>= 1) {
|
|
||||||
p = base + (lim >> 1);
|
|
||||||
cmp = c - (int)p->capital;
|
|
||||||
if (cmp == 0)
|
|
||||||
return p->small;
|
|
||||||
if (cmp > 0) { /* key > p: move right */
|
|
||||||
base = p + 1;
|
|
||||||
lim--;
|
|
||||||
} /* else move left */
|
|
||||||
}
|
}
|
||||||
return c0;
|
|
||||||
|
unsigned short latin_tolower(unsigned short c) {
|
||||||
|
struct LatinCapitalSmallPair *p =
|
||||||
|
(struct LatinCapitalSmallPair *)bsearch(&c, SORTED_CHAR_MAP,
|
||||||
|
sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]),
|
||||||
|
sizeof(SORTED_CHAR_MAP[0]),
|
||||||
|
compare_pair_capital);
|
||||||
|
return p ? p->small : c;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace latinime
|
} // namespace latinime
|
||||||
|
|
Loading…
Reference in New Issue