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

[vector] Make hb_vector_t hashable

This commit is contained in:
Behdad Esfahbod 2022-05-19 13:03:50 -06:00
parent 124f9aeb9b
commit 14a24d8e3f
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-vector.hh
View File

@ -43,6 +43,7 @@ struct hb_vector_t : std::conditional<sorted, hb_vector_t<Type, false>, hb_empty
using c_array_t = typename std::conditional<sorted, hb_sorted_array_t<const Type>, hb_array_t<const Type>>::type; using c_array_t = typename std::conditional<sorted, hb_sorted_array_t<const Type>, hb_array_t<const Type>>::type;
hb_vector_t () = default; hb_vector_t () = default;
hb_vector_t (std::nullptr_t) : hb_vector_t () {}
hb_vector_t (std::initializer_list<Type> lst) : hb_vector_t () hb_vector_t (std::initializer_list<Type> lst) : hb_vector_t ()
{ {
alloc (lst.size ()); alloc (lst.size ());

26
src/test-map.cc
View File

@ -30,6 +30,7 @@
static const std::string invalid{"invalid"}; static const std::string invalid{"invalid"};
static const hb_set_t invalid_set{}; static const hb_set_t invalid_set{};
static const hb_vector_t<unsigned> invalid_vector{};
int int
main (int argc, char **argv) main (int argc, char **argv)
@ -151,6 +152,7 @@ main (int argc, char **argv)
} }
} }
/* Test hashing sets. */
{ {
hb_hashmap_t<hb_set_t, hb_set_t, const hb_set_t *, const hb_set_t *, &invalid_set, &invalid_set> m1; hb_hashmap_t<hb_set_t, hb_set_t, const hb_set_t *, const hb_set_t *, &invalid_set, &invalid_set> m1;
hb_hashmap_t<hb_set_t, hb_set_t, std::nullptr_t, std::nullptr_t, nullptr, nullptr> m2; hb_hashmap_t<hb_set_t, hb_set_t, std::nullptr_t, std::nullptr_t, nullptr, nullptr> m2;
@ -172,5 +174,29 @@ main (int argc, char **argv)
assert (m2.get (hb_set_t {1}) == hb_set_t {2}); assert (m2.get (hb_set_t {1}) == hb_set_t {2});
} }
/* Test hashing vectors. */
{
using vector_t = hb_vector_t<unsigned>;
hb_hashmap_t<vector_t, vector_t, const vector_t *, const vector_t *, &invalid_vector, &invalid_vector> m1;
hb_hashmap_t<vector_t, vector_t, std::nullptr_t, std::nullptr_t, nullptr, nullptr> m2;
m1.set (vector_t (), vector_t ());
m2.set (vector_t (), vector_t ());
m1.set (vector_t (), vector_t {1});
m2.set (vector_t (), vector_t {1});
m1.set (vector_t {1}, vector_t {2});
m2.set (vector_t {1}, vector_t {2});
/* Cannot override empty vector. */
assert (m1.get (vector_t ()) == vector_t ());
assert (m2.get (vector_t ()) == vector_t ());
assert (m1.get (vector_t {1}) == vector_t {2});
assert (m2.get (vector_t {1}) == vector_t {2});
}
return 0; return 0;
} }