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

Fix hb_map_is_empty logic 

This needs reviewing
This commit is contained in:
Ebrahim Byagowi 2018-10-19 12:05:26 +03:30
parent 9df2fb1611
commit 114f66dda6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-map.hh
View File

@ -172,7 +172,7 @@ struct hb_map_t
inline bool is_empty (void) const inline bool is_empty (void) const
{ {
return population != 0; return population == 0;
} }
inline unsigned int get_population () const inline unsigned int get_population () const

13
test/api/test-map.c
View File

@ -31,20 +31,20 @@ static void
test_map_basic (void) test_map_basic (void)
{ {
hb_map_t *empty = hb_map_get_empty (); hb_map_t *empty = hb_map_get_empty ();
g_assert (!hb_map_is_empty (empty)); /* this feels wrong */ g_assert (hb_map_is_empty (empty));
g_assert (!hb_map_allocation_successful (empty)); g_assert (!hb_map_allocation_successful (empty));
hb_map_destroy (empty); hb_map_destroy (empty);
hb_map_t *m = hb_map_create (); hb_map_t *m = hb_map_create ();
g_assert (hb_map_allocation_successful (m)); g_assert (hb_map_allocation_successful (m));
g_assert (!hb_map_is_empty (m)); /* this as well */ g_assert (hb_map_is_empty (m));
hb_map_set (m, 213, 223); hb_map_set (m, 213, 223);
hb_map_set (m, 643, 675); hb_map_set (m, 643, 675);
g_assert_cmpint (hb_map_get_population (m), ==, 2); g_assert_cmpint (hb_map_get_population (m), ==, 2);
g_assert_cmpint (hb_map_get (m, 213), ==, 223); g_assert_cmpint (hb_map_get (m, 213), ==, 223);
g_assert (hb_map_get (m, 123) == -1); g_assert (!hb_map_has (m, 123));
g_assert (hb_map_has (m, 213)); g_assert (hb_map_has (m, 213));
hb_map_del (m, 213); hb_map_del (m, 213);
@ -94,12 +94,14 @@ test_map_refcount ()
hb_map_t *m2 = hb_map_reference (m); hb_map_t *m2 = hb_map_reference (m);
hb_map_destroy (m); hb_map_destroy (m);
/* We copied its reference so it is still usable after one destroy */
g_assert (hb_map_has (m, 213)); g_assert (hb_map_has (m, 213));
g_assert (hb_map_has (m2, 213)); g_assert (hb_map_has (m2, 213));
hb_map_destroy (m2); hb_map_destroy (m2);
g_assert (hb_map_has (m, 213)); /* shouldn't these return false? */
g_assert (hb_map_has (m2, 213)); /* Now you can't access them anymore */
} }
int int
@ -109,6 +111,7 @@ main (int argc, char **argv)
hb_test_add (test_map_basic); hb_test_add (test_map_basic);
hb_test_add (test_map_userdata); hb_test_add (test_map_userdata);
hb_test_add (test_map_refcount);
return hb_test_run(); return hb_test_run();
} }