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

tweak reflecting review & add test cases

This commit is contained in:
ariza 2020-02-25 15:03:12 -08:00
parent de896278f7
commit 4081439d2a
2 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/hb-set.hh
View File

@ -384,6 +384,23 @@ struct hb_set_t
page->del (g); page->del (g);
} }
private:
void del_pages (int ds, int de)
{
if (ds <= de)
{
unsigned int write_index = 0;
for (unsigned int i = 0; i < page_map.length; i++)
{
int m = (int) page_map[i].major;
if (m < ds || de < m)
page_map[write_index++] = page_map[i];
}
compact (write_index);
}
}
public:
void del_range (hb_codepoint_t a, hb_codepoint_t b) void del_range (hb_codepoint_t a, hb_codepoint_t b)
{ {
/* TODO perform op even if !successful. */ /* TODO perform op even if !successful. */
@ -393,9 +410,9 @@ struct hb_set_t
unsigned int ma = get_major (a); unsigned int ma = get_major (a);
unsigned int mb = get_major (b); unsigned int mb = get_major (b);
/* Delete pages from ds through de if ds <= de. */ /* Delete pages from ds through de if ds <= de. */
int ds = (a == major_start (ma))? (int)ma: (int)(ma + 1); int ds = (a == major_start (ma))? (int) ma: (int) (ma + 1);
int de = (b + 1 == major_start (mb + 1))? (int)mb: ((int)mb - 1); int de = (b + 1 == major_start (mb + 1))? (int) mb: ((int) mb - 1);
if (ds > de || (int)ma < ds) if (ds > de || (int) ma < ds)
{ {
page_t *page = page_for (a); page_t *page = page_for (a);
if (page) if (page)
@ -406,23 +423,13 @@ struct hb_set_t
page->del_range (a, major_start (ma + 1) - 1); page->del_range (a, major_start (ma + 1) - 1);
} }
} }
if (de < (int)mb && ma != mb) if (de < (int) mb && ma != mb)
{ {
page_t *page = page_for (b); page_t *page = page_for (b);
if (page) if (page)
page->del_range (major_start (mb), b); page->del_range (major_start (mb), b);
} }
if (ds <= de) del_pages (ds, de);
{
unsigned int write_index = 0;
for (unsigned int i = 0; i < page_map.length; i++)
{
unsigned int m = page_map[i].major;
if ((int)m < ds || de < (int)m)
page_map[write_index++] = page_map[i];
}
compact (write_index);
}
} }
bool get (hb_codepoint_t g) const bool get (hb_codepoint_t g) const

49
test/api/test-set.c
View File

@ -473,29 +473,46 @@ test_set_empty (void)
static void static void
test_set_delrange (void) test_set_delrange (void)
{ {
const unsigned P = 512; /* Page size. */
struct { unsigned b, e; } ranges[] = {
{ 35, P-15 }, /* From page middle thru middle. */
{ P, P+100 }, /* From page start thru middle. */
{ P+300, P*2-1 }, /* From page middle thru end. */
{ P*3, P*4+100 }, /* From page start thru next page middle. */
{ P*4+300, P*6-1 }, /* From page middle thru next page end. */
{ P*6+200,P*8+100 }, /* From page middle covering one page thru page middle. */
{ P*9, P*10+105 }, /* From page start covering one page thru page middle. */
{ P*10+305, P*12-1 }, /* From page middle covering one page thru page end. */
{ P*13, P*15-1 }, /* From page start covering two pages thru page end. */
{ P*15+100, P*18+100 } /* From page middle covering two pages thru page middle. */
};
unsigned n = sizeof (ranges) / sizeof(ranges[0]);
hb_set_t *s = hb_set_create (); hb_set_t *s = hb_set_create ();
test_empty (s); test_empty (s);
for (unsigned int g = 0; g < 2100; g += 10) for (unsigned int g = 0; g < ranges[n - 1].e + P; g += 2)
hb_set_add (s, g); hb_set_add (s, g);
hb_set_add (s, 512); /* edge case */ hb_set_add (s, P*2-1);
hb_set_add (s, 2047); /* (=512*4-1) edge case */ hb_set_add (s, P*6-1);
hb_set_add (s, P*12-1);
hb_set_add (s, P*15-1);
hb_set_del_range (s, 512, 705); for (unsigned i = 0; i < n; i++)
hb_set_del_range (s, 795, 2047); hb_set_del_range (s, ranges[i].b, ranges[i].e);
hb_set_del_range (s, P*13+5, P*15-10); /* Deletion from deleted pages. */
g_assert ( hb_set_has (s, 0)); for (unsigned i = 0; i < n; i++)
g_assert ( hb_set_has (s, 510)); {
g_assert (!hb_set_has (s, 512)); unsigned b = ranges[i].b;
g_assert (!hb_set_has (s, 700)); unsigned e = ranges[i].e;
g_assert ( hb_set_has (s, 710)); g_assert (hb_set_has (s, (b-2)&~1));
g_assert ( hb_set_has (s, 790)); while (b <= e)
g_assert (!hb_set_has (s, 800)); g_assert (!hb_set_has (s, b++));
g_assert (!hb_set_has (s, 1500)); g_assert (hb_set_has (s, (e+2)&~1));
g_assert (!hb_set_has (s, 2040)); }
g_assert (!hb_set_has (s, 2047));
g_assert ( hb_set_has (s, 2050));
hb_set_destroy (s); hb_set_destroy (s);
} }