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

[unicode] Simplify method setting

This commit is contained in:
Behdad Esfahbod 2011-05-11 11:55:11 -04:00
parent d5bfd02721
commit 7aa12ebdff
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-unicode.cc
View File

@ -206,14 +206,10 @@ hb_unicode_funcs_set_##name##_func (hb_unicode_funcs_t *ufuncs, \
ufuncs->get.name = func; \ ufuncs->get.name = func; \
ufuncs->user_data.name = user_data; \ ufuncs->user_data.name = user_data; \
ufuncs->destroy.name = destroy; \ ufuncs->destroy.name = destroy; \
} else if (ufuncs->parent != NULL) { \ } else { \
ufuncs->get.name = ufuncs->parent->get.name; \ ufuncs->get.name = ufuncs->parent->get.name; \
ufuncs->user_data.name = ufuncs->parent->user_data.name; \ ufuncs->user_data.name = ufuncs->parent->user_data.name; \
ufuncs->destroy.name = NULL; \ ufuncs->destroy.name = NULL; \
} else { \
ufuncs->get.name = hb_unicode_get_##name##_nil; \
ufuncs->user_data.name = NULL; \
ufuncs->destroy.name = NULL; \
} \ } \
} \ } \
\ \

6
test/test-unicode.c
View File

@ -482,6 +482,7 @@ test_unicode_properties (gconstpointer user_data)
gboolean failed = TRUE; gboolean failed = TRUE;
g_assert (hb_unicode_funcs_is_immutable (uf)); g_assert (hb_unicode_funcs_is_immutable (uf));
g_assert (hb_unicode_funcs_get_parent (uf));
for (i = 0; i < G_N_ELEMENTS (properties); i++) { for (i = 0; i < G_N_ELEMENTS (properties); i++) {
const property_t *p = &properties[i]; const property_t *p = &properties[i];
@ -609,6 +610,9 @@ test_unicode_setters (void)
g_assert_cmphex (p->getter (uf, 'a'), ==, HB_SCRIPT_LATIN); g_assert_cmphex (p->getter (uf, 'a'), ==, HB_SCRIPT_LATIN);
g_assert_cmphex (p->getter (uf, '0'), ==, HB_SCRIPT_UNKNOWN); g_assert_cmphex (p->getter (uf, '0'), ==, HB_SCRIPT_UNKNOWN);
p->func_setter (uf, (get_func_t) NULL, NULL, NULL);
g_assert (data[0].freed && !data[1].freed);
g_assert (!hb_unicode_funcs_is_immutable (uf)); g_assert (!hb_unicode_funcs_is_immutable (uf));
hb_unicode_funcs_make_immutable (uf); hb_unicode_funcs_make_immutable (uf);
g_assert (hb_unicode_funcs_is_immutable (uf)); g_assert (hb_unicode_funcs_is_immutable (uf));
@ -616,7 +620,7 @@ test_unicode_setters (void)
/* Since uf is immutable now, the following setter should do nothing. */ /* Since uf is immutable now, the following setter should do nothing. */
p->func_setter (uf, (get_func_t) a_is_for_arabic_get_script, &data[1], free_up); p->func_setter (uf, (get_func_t) a_is_for_arabic_get_script, &data[1], free_up);
g_assert (!data[0].freed && !data[1].freed); g_assert (data[0].freed && !data[1].freed);
hb_unicode_funcs_destroy (uf); hb_unicode_funcs_destroy (uf);
g_assert (data[0].freed && !data[1].freed); g_assert (data[0].freed && !data[1].freed);