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

Properly prioritize hb_hash()

This commit is contained in:
Behdad Esfahbod 2019-04-16 17:28:18 -04:00
parent 75fd845a4a
commit c918a6706f
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/hb-algs.hh
View File

@ -48,27 +48,22 @@ struct
struct struct
{ {
/* Don't know how to set priority of following. Doesn't work right now. */ private:
//template <typename T> template <typename T> auto
//uint32_t operator () (const T& v) const impl (const T& v, hb_priority<1>) const HB_AUTO_RETURN_EXPR (hb_deref_pointer (v).hash ())
//{ return hb_deref_pointer (v).hash (); }
/* Instead, the following ugly soution: */
template <typename T,
hb_enable_if (!hb_is_integer (hb_remove_const<hb_remove_reference<T> >) &&
!hb_is_pointer (T))>
uint32_t operator () (T&& v) const { return v.hash (); }
template <typename T>
uint32_t operator () (const T *v) const
{ return operator() (*v); }
template <typename T, template <typename T,
hb_enable_if (hb_is_integer (T))> hb_enable_if (hb_is_integer (T))> auto
uint32_t operator () (T v) const impl (const T& v, hb_priority<0>) const HB_AUTO_RETURN_EXPR
{ (
/* Knuth's multiplicative method: */ /* Knuth's multiplicative method: */
return (uint32_t) v * 2654435761u; (uint32_t) v * 2654435761u
} )
public:
template <typename T> auto
operator () (const T& v) const HB_AUTO_RETURN_EXPR ((uint32_t) impl (v, hb_prioritize))
} HB_FUNCOBJ (hb_hash); } HB_FUNCOBJ (hb_hash);
struct struct
@ -96,7 +91,8 @@ struct
public: public:
template <typename Appl, typename Val> auto template <typename Appl, typename Val> auto
operator () (Appl&& a, Val &&v) const HB_AUTO_RETURN_EXPR ( operator () (Appl&& a, Val &&v) const HB_AUTO_RETURN_EXPR
(
impl (hb_forward<Appl> (a), impl (hb_forward<Appl> (a),
hb_forward<Val> (v), hb_forward<Val> (v),
hb_prioritize) hb_prioritize)
@ -114,7 +110,8 @@ struct
impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN_EXPR (p.has (v)) impl (Pred&& p, Val &&v, hb_priority<1>) const HB_AUTO_RETURN_EXPR (p.has (v))
template <typename Pred, typename Val> auto template <typename Pred, typename Val> auto
impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN_EXPR ( impl (Pred&& p, Val &&v, hb_priority<0>) const HB_AUTO_RETURN_EXPR
(
hb_invoke (hb_forward<Pred> (p), hb_invoke (hb_forward<Pred> (p),
hb_forward<Val> (v)) hb_forward<Val> (v))
) )
@ -122,7 +119,8 @@ struct
public: public:
template <typename Pred, typename Val> auto template <typename Pred, typename Val> auto
operator () (Pred&& p, Val &&v) const HB_AUTO_RETURN_EXPR ( operator () (Pred&& p, Val &&v) const HB_AUTO_RETURN_EXPR
(
(bool) impl (hb_forward<Pred> (p), (bool) impl (hb_forward<Pred> (p),
hb_forward<Val> (v), hb_forward<Val> (v),
hb_prioritize) hb_prioritize)
@ -140,7 +138,8 @@ struct
impl (Proj&& f, Val &&v, hb_priority<1>) const HB_AUTO_RETURN_EXPR (f.get (hb_forward<Val> (v))) impl (Proj&& f, Val &&v, hb_priority<1>) const HB_AUTO_RETURN_EXPR (f.get (hb_forward<Val> (v)))
template <typename Proj, typename Val> auto template <typename Proj, typename Val> auto
impl (Proj&& f, Val &&v, hb_priority<0>) const HB_AUTO_RETURN_EXPR ( impl (Proj&& f, Val &&v, hb_priority<0>) const HB_AUTO_RETURN_EXPR
(
hb_invoke (hb_forward<Proj> (f), hb_invoke (hb_forward<Proj> (f),
hb_forward<Val> (v)) hb_forward<Val> (v))
) )
@ -148,7 +147,8 @@ struct
public: public:
template <typename Proj, typename Val> auto template <typename Proj, typename Val> auto
operator () (Proj&& f, Val &&v) const HB_AUTO_RETURN_EXPR ( operator () (Proj&& f, Val &&v) const HB_AUTO_RETURN_EXPR
(
impl (hb_forward<Proj> (f), impl (hb_forward<Proj> (f),
hb_forward<Val> (v), hb_forward<Val> (v),
hb_prioritize) hb_prioritize)