walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[buffer] Templatize UTF-* functions

This commit is contained in:
Behdad Esfahbod 2014-07-16 14:49:55 -04:00
parent e634fed428
commit 625dbf141a
2 changed files with 172 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-buffer.cc
View File

@ -1298,6 +1298,8 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
unsigned int item_offset, unsigned int item_offset,
int item_length) int item_length)
{ {
typedef hb_utf_t<T> utf_t;
assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE ||
(!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); (!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID));
@ -1305,7 +1307,7 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
return; return;
if (text_length == -1) if (text_length == -1)
text_length = hb_utf_strlen (text); text_length = utf_t::strlen (text);
if (item_length == -1) if (item_length == -1)
item_length = text_length - item_offset; item_length = text_length - item_offset;
@ -1328,7 +1330,7 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
while (start < prev && buffer->context_len[0] < buffer->CONTEXT_LENGTH) while (start < prev && buffer->context_len[0] < buffer->CONTEXT_LENGTH)
{ {
hb_codepoint_t u; hb_codepoint_t u;
prev = hb_utf_prev (prev, start, &u); prev = utf_t::prev (prev, start, &u);
buffer->context[0][buffer->context_len[0]++] = u; buffer->context[0][buffer->context_len[0]++] = u;
} }
} }
@ -1339,7 +1341,7 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
{ {
hb_codepoint_t u; hb_codepoint_t u;
const T *old_next = next; const T *old_next = next;
next = hb_utf_next (next, end, &u); next = utf_t::next (next, end, &u);
buffer->add (u, old_next - (const T *) text); buffer->add (u, old_next - (const T *) text);
} }
@ -1349,7 +1351,7 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
while (next < end && buffer->context_len[1] < buffer->CONTEXT_LENGTH) while (next < end && buffer->context_len[1] < buffer->CONTEXT_LENGTH)
{ {
hb_codepoint_t u; hb_codepoint_t u;
next = hb_utf_next (next, end, &u); next = utf_t::next (next, end, &u);
buffer->context[1][buffer->context_len[1]++] = u; buffer->context[1][buffer->context_len[1]++] = u;
} }

43
src/hb-utf-private.hh
View File

@ -29,11 +29,16 @@
#include "hb-private.hh" #include "hb-private.hh"
template <typename T, bool validate=true> struct hb_utf_t;
/* UTF-8 */ /* UTF-8 */
template <>
struct hb_utf_t<uint8_t, true>
{
static inline const uint8_t * static inline const uint8_t *
hb_utf_next (const uint8_t *text, next (const uint8_t *text,
const uint8_t *end, const uint8_t *end,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
@ -101,7 +106,7 @@ error:
} }
static inline const uint8_t * static inline const uint8_t *
hb_utf_prev (const uint8_t *text, prev (const uint8_t *text,
const uint8_t *start, const uint8_t *start,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
@ -109,25 +114,28 @@ hb_utf_prev (const uint8_t *text,
while (start < text && (*text & 0xc0) == 0x80 && end - text < 4) while (start < text && (*text & 0xc0) == 0x80 && end - text < 4)
text--; text--;
if (likely (hb_utf_next (text, end, unicode) == end)) if (likely (next (text, end, unicode) == end))
return text; return text;
*unicode = -1; *unicode = -1;
return end - 1; return end - 1;
} }
static inline unsigned int static inline unsigned int
hb_utf_strlen (const uint8_t *text) strlen (const uint8_t *text)
{ {
return strlen ((const char *) text); return ::strlen ((const char *) text);
} }
};
/* UTF-16 */ /* UTF-16 */
template <>
struct hb_utf_t<uint16_t, true>
{
static inline const uint16_t * static inline const uint16_t *
hb_utf_next (const uint16_t *text, next (const uint16_t *text,
const uint16_t *end, const uint16_t *end,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
@ -158,7 +166,7 @@ hb_utf_next (const uint16_t *text,
} }
static inline const uint16_t * static inline const uint16_t *
hb_utf_prev (const uint16_t *text, prev (const uint16_t *text,
const uint16_t *start, const uint16_t *start,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
@ -174,7 +182,7 @@ hb_utf_prev (const uint16_t *text,
if (likely (start < text && hb_in_range (c, 0xDC00u, 0xDFFFu))) if (likely (start < text && hb_in_range (c, 0xDC00u, 0xDFFFu)))
text--; text--;
if (likely (hb_utf_next (text, end, unicode) == end)) if (likely (next (text, end, unicode) == end))
return text; return text;
*unicode = -1; *unicode = -1;
@ -183,23 +191,27 @@ hb_utf_prev (const uint16_t *text,
static inline unsigned int static inline unsigned int
hb_utf_strlen (const uint16_t *text) strlen (const uint16_t *text)
{ {
unsigned int l = 0; unsigned int l = 0;
while (*text++) l++; while (*text++) l++;
return l; return l;
} }
};
/* UTF-32 */ /* UTF-32 */
template <bool validate>
struct hb_utf_t<uint32_t, validate>
{
static inline const uint32_t * static inline const uint32_t *
hb_utf_next (const uint32_t *text, next (const uint32_t *text,
const uint32_t *end HB_UNUSED, const uint32_t *end HB_UNUSED,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
hb_codepoint_t c = *text++; hb_codepoint_t c = *text++;
if (unlikely (c > 0x10FFFFu || hb_in_range (c, 0xD800u, 0xDFFFu))) if (validate && unlikely (c > 0x10FFFFu || hb_in_range (c, 0xD800u, 0xDFFFu)))
goto error; goto error;
*unicode = c; *unicode = c;
return text; return text;
@ -210,21 +222,22 @@ error:
} }
static inline const uint32_t * static inline const uint32_t *
hb_utf_prev (const uint32_t *text, prev (const uint32_t *text,
const uint32_t *start HB_UNUSED, const uint32_t *start HB_UNUSED,
hb_codepoint_t *unicode) hb_codepoint_t *unicode)
{ {
hb_utf_next (text - 1, text, unicode); next (text - 1, text, unicode);
return text - 1; return text - 1;
} }
static inline unsigned int static inline unsigned int
hb_utf_strlen (const uint32_t *text) strlen (const uint32_t *text)
{ {
unsigned int l = 0; unsigned int l = 0;
while (*text++) l++; while (*text++) l++;
return l; return l;
} }
};
#endif /* HB_UTF_PRIVATE_HH */ #endif /* HB_UTF_PRIVATE_HH */