From 83e3eabd84e2b53c696768d1357a6a259bcd3576 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 7 May 2019 20:58:43 -0700 Subject: [PATCH] Whitespace --- src/hb-aat-layout-common.hh | 2 +- src/hb-aat-layout-kerx-table.hh | 2 +- src/hb-aat-layout-morx-table.hh | 2 +- src/hb-algs.hh | 6 +++--- src/hb-dispatch.hh | 2 +- src/hb-open-type.hh | 18 +++++++++--------- src/hb-ot-kern-table.hh | 4 ++-- src/hb-ot-layout-common.hh | 2 +- src/hb-ot-layout-gpos-table.hh | 16 ++++++++-------- src/hb-ot-layout-gsub-table.hh | 14 +++++++------- src/hb-ot-layout-gsubgpos.hh | 8 ++++---- src/hb-sanitize.hh | 6 +++--- src/hb-serialize.hh | 12 ++++++------ src/hb-subset.hh | 6 +++--- 14 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/hb-aat-layout-common.hh b/src/hb-aat-layout-common.hh index ea24c9f0c..a8c4b7637 100644 --- a/src/hb-aat-layout-common.hh +++ b/src/hb-aat-layout-common.hh @@ -154,7 +154,7 @@ struct LookupSegmentArray valuesZ.sanitize (c, base, last - first + 1)); } template - bool sanitize (hb_sanitize_context_t *c, const void *base, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, const void *base, Ts&&... ds) const { TRACE_SANITIZE (this); return_trace (c->check_struct (this) && diff --git a/src/hb-aat-layout-kerx-table.hh b/src/hb-aat-layout-kerx-table.hh index 1b3f1f942..cec63ac6d 100644 --- a/src/hb-aat-layout-kerx-table.hh +++ b/src/hb-aat-layout-kerx-table.hh @@ -772,7 +772,7 @@ struct KerxSubTable unsigned int get_type () const { return u.header.coverage & u.header.SubtableType; } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); diff --git a/src/hb-aat-layout-morx-table.hh b/src/hb-aat-layout-morx-table.hh index 7aa830d64..81d78972a 100644 --- a/src/hb-aat-layout-morx-table.hh +++ b/src/hb-aat-layout-morx-table.hh @@ -884,7 +884,7 @@ struct ChainSubtable }; template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); diff --git a/src/hb-algs.hh b/src/hb-algs.hh index fe41702cf..23cb9b061 100644 --- a/src/hb-algs.hh +++ b/src/hb-algs.hh @@ -75,7 +75,7 @@ struct /* Pointer-to-member-function. */ template auto - impl (Appl&& a, hb_priority<2>, Val1 &&v1, Vals &&...vs) const HB_AUTO_RETURN + impl (Appl&& a, hb_priority<2>, Val1 &&v1, Vals&&... vs) const HB_AUTO_RETURN ((hb_deref (hb_forward (v1)).*hb_forward (a)) (hb_forward (vs)...)) /* Pointer-to-member. */ @@ -85,13 +85,13 @@ struct /* Operator(). */ template auto - impl (Appl&& a, hb_priority<0>, Vals &&...vs) const HB_AUTO_RETURN + impl (Appl&& a, hb_priority<0>, Vals&&... vs) const HB_AUTO_RETURN (hb_deref (hb_forward (a)) (hb_forward (vs)...)) public: template auto - operator () (Appl&& a, Vals &&...vs) const HB_AUTO_RETURN + operator () (Appl&& a, Vals&&... vs) const HB_AUTO_RETURN ( impl (hb_forward (a), hb_prioritize, diff --git a/src/hb-dispatch.hh b/src/hb-dispatch.hh index 6b497823d..be4a90f4f 100644 --- a/src/hb-dispatch.hh +++ b/src/hb-dispatch.hh @@ -48,7 +48,7 @@ struct hb_dispatch_context_t template bool may_dispatch (const T *obj HB_UNUSED, const F *format HB_UNUSED) { return true; } template - return_t dispatch (const T &obj, Ts &&...ds) + return_t dispatch (const T &obj, Ts&&... ds) { return obj.dispatch (thiz (), hb_forward (ds)...); } static return_t no_dispatch_return_value () { return Context::default_return_value (); } static bool stop_sublookup_iteration (const return_t r HB_UNUSED) { return false; } diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh index 9458ceea7..e2e562300 100644 --- a/src/hb-open-type.hh +++ b/src/hb-open-type.hh @@ -285,7 +285,7 @@ struct OffsetTo : Offset } template - bool serialize_subset (hb_subset_context_t *c, const Type &src, const void *base, Ts &&...ds) + bool serialize_subset (hb_subset_context_t *c, const Type &src, const void *base, Ts&&... ds) { *this = 0; if (has_null && &src == _hb_has_null::get_null ()) @@ -307,7 +307,7 @@ struct OffsetTo : Offset /* TODO: Somehow merge this with previous function into a serialize_dispatch(). */ template - bool serialize_copy (hb_serialize_context_t *c, const Type &src, const void *base, Ts &&...ds) + bool serialize_copy (hb_serialize_context_t *c, const Type &src, const void *base, Ts&&... ds) { *this = 0; if (has_null && &src == _hb_has_null::get_null ()) @@ -332,7 +332,7 @@ struct OffsetTo : Offset } template - bool sanitize (hb_sanitize_context_t *c, const void *base, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, const void *base, Ts&&... ds) const { TRACE_SANITIZE (this); return_trace (sanitize_shallow (c, base) && @@ -465,7 +465,7 @@ struct UnsizedArrayOf return_trace (true); } template - bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts&&... ds) const { TRACE_SANITIZE (this); if (unlikely (!sanitize_shallow (c, count))) return_trace (false); @@ -511,7 +511,7 @@ struct UnsizedOffsetListOf : UnsizedOffsetArrayOf } template - bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts&&... ds) const { TRACE_SANITIZE (this); return_trace ((UnsizedOffsetArrayOf @@ -647,7 +647,7 @@ struct ArrayOf return_trace (true); } template - bool sanitize (hb_sanitize_context_t *c, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const { TRACE_SANITIZE (this); if (unlikely (!sanitize_shallow (c))) return_trace (false); @@ -721,7 +721,7 @@ struct OffsetListOf : OffsetArrayOf } template - bool sanitize (hb_sanitize_context_t *c, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const { TRACE_SANITIZE (this); return_trace (OffsetArrayOf::sanitize (c, this, hb_forward (ds)...)); @@ -823,7 +823,7 @@ struct ArrayOfM1 { return lenM1.static_size + (lenM1 + 1) * Type::static_size; } template - bool sanitize (hb_sanitize_context_t *c, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const { TRACE_SANITIZE (this); if (unlikely (!sanitize_shallow (c))) return_trace (false); @@ -1028,7 +1028,7 @@ struct VarSizedBinSearchArrayOf return_trace (true); } template - bool sanitize (hb_sanitize_context_t *c, Ts &&...ds) const + bool sanitize (hb_sanitize_context_t *c, Ts&&... ds) const { TRACE_SANITIZE (this); if (unlikely (!sanitize_shallow (c))) return_trace (false); diff --git a/src/hb-ot-kern-table.hh b/src/hb-ot-kern-table.hh index 1310b843c..436dad45d 100644 --- a/src/hb-ot-kern-table.hh +++ b/src/hb-ot-kern-table.hh @@ -122,7 +122,7 @@ struct KernSubTable } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); @@ -305,7 +305,7 @@ struct kern { return dispatch (c); } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { unsigned int subtable_type = get_type (); TRACE_DISPATCH (this, subtable_type); diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 153ee83e5..17a03c85f 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -683,7 +683,7 @@ struct Lookup } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { unsigned int lookup_type = get_type (); TRACE_DISPATCH (this, lookup_type); diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh index 4693f3818..228820a17 100644 --- a/src/hb-ot-layout-gpos-table.hh +++ b/src/hb-ot-layout-gpos-table.hh @@ -577,7 +577,7 @@ struct SinglePosFormat2 struct SinglePos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -908,7 +908,7 @@ struct PairPosFormat2 struct PairPos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1093,7 +1093,7 @@ struct CursivePosFormat1 struct CursivePos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1209,7 +1209,7 @@ struct MarkBasePosFormat1 struct MarkBasePos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1334,7 +1334,7 @@ struct MarkLigPosFormat1 struct MarkLigPos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1456,7 +1456,7 @@ struct MarkMarkPosFormat1 struct MarkMarkPos { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1508,7 +1508,7 @@ struct PosLookupSubTable }; template - typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type, Ts&&... ds) const { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { @@ -1582,7 +1582,7 @@ struct PosLookup : Lookup static typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index); template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { return Lookup::dispatch (c, hb_forward (ds)...); } bool subset (hb_subset_context_t *c) const diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh index 5b25137c8..364ef189e 100644 --- a/src/hb-ot-layout-gsub-table.hh +++ b/src/hb-ot-layout-gsub-table.hh @@ -252,7 +252,7 @@ struct SingleSubst } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -441,7 +441,7 @@ struct MultipleSubst } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -615,7 +615,7 @@ struct AlternateSubst } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -946,7 +946,7 @@ struct LigatureSubst } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1114,7 +1114,7 @@ struct ReverseChainSingleSubstFormat1 struct ReverseChainSingleSubst { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -1154,7 +1154,7 @@ struct SubstLookupSubTable }; template - typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type, Ts&&... ds) const { TRACE_DISPATCH (this, lookup_type); switch (lookup_type) { @@ -1332,7 +1332,7 @@ struct SubstLookup : Lookup } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { return Lookup::dispatch (c, hb_forward (ds)...); } bool subset (hb_subset_context_t *c) const diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh index 3c4bfa2c3..3d4a1bca8 100644 --- a/src/hb-ot-layout-gsubgpos.hh +++ b/src/hb-ot-layout-gsubgpos.hh @@ -1764,7 +1764,7 @@ struct ContextFormat3 struct Context { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -2475,7 +2475,7 @@ struct ChainContextFormat3 struct ChainContext { template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); @@ -2511,7 +2511,7 @@ struct ExtensionFormat1 } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, format); if (unlikely (!c->may_dispatch (this, this))) return_trace (c->no_dispatch_return_value ()); @@ -2558,7 +2558,7 @@ struct Extension } template - typename context_t::return_t dispatch (context_t *c, Ts &&...ds) const + typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const { TRACE_DISPATCH (this, u.format); if (unlikely (!c->may_dispatch (this, &u.format))) return_trace (c->no_dispatch_return_value ()); diff --git a/src/hb-sanitize.hh b/src/hb-sanitize.hh index 982723362..ac424c1d9 100644 --- a/src/hb-sanitize.hh +++ b/src/hb-sanitize.hh @@ -136,14 +136,14 @@ struct hb_sanitize_context_t : private: template auto - _dispatch (const T &obj, hb_priority<1>, Ts &&...ds) HB_AUTO_RETURN + _dispatch (const T &obj, hb_priority<1>, Ts&&... ds) HB_AUTO_RETURN ( obj.sanitize (this, hb_forward (ds)...) ) template auto - _dispatch (const T &obj, hb_priority<0>, Ts &&...ds) HB_AUTO_RETURN + _dispatch (const T &obj, hb_priority<0>, Ts&&... ds) HB_AUTO_RETURN ( obj.dispatch (this, hb_forward (ds)...) ) public: template auto - dispatch (const T &obj, Ts &&...ds) HB_AUTO_RETURN + dispatch (const T &obj, Ts&&... ds) HB_AUTO_RETURN ( _dispatch (obj, hb_prioritize, hb_forward (ds)...) ) diff --git a/src/hb-serialize.hh b/src/hb-serialize.hh index 21545a802..e0f79809f 100644 --- a/src/hb-serialize.hh +++ b/src/hb-serialize.hh @@ -134,7 +134,7 @@ struct hb_serialize_context_t template bool propagate_error (T &&obj) { return check_success (!hb_deref (obj).in_error ()); } - template bool propagate_error (T1 &&o1, Ts &&...os) + template bool propagate_error (T1 &&o1, Ts&&... os) { return propagate_error (hb_forward (o1)) && propagate_error (hb_forward (os)...); } @@ -371,7 +371,7 @@ struct hb_serialize_context_t { return embed (hb_addressof (obj)); } template auto - _copy (const Type &src, hb_priority<1>, Ts &&...ds) HB_RETURN + _copy (const Type &src, hb_priority<1>, Ts&&... ds) HB_RETURN (Type *, src.copy (this, hb_forward (ds)...)) template auto @@ -386,10 +386,10 @@ struct hb_serialize_context_t /* Like embed, but active: calls obj.operator=() or obj.copy() to transfer data * instead of memcpy(). */ template - Type *copy (const Type &src, Ts &&...ds) + Type *copy (const Type &src, Ts&&... ds) { return _copy (src, hb_prioritize, hb_forward (ds)...); } template - Type *copy (const Type *src, Ts &&...ds) + Type *copy (const Type *src, Ts&&... ds) { return copy (*src, hb_forward (ds)...); } template @@ -414,10 +414,10 @@ struct hb_serialize_context_t Type *extend_min (Type &obj) { return extend_min (hb_addressof (obj)); } template - Type *extend (Type *obj, Ts &&...ds) + Type *extend (Type *obj, Ts&&... ds) { return extend_size (obj, obj->get_size (hb_forward (ds)...)); } template - Type *extend (Type &obj, Ts &&...ds) + Type *extend (Type &obj, Ts&&... ds) { return extend (hb_addressof (obj), hb_forward (ds)...); } /* Output routines. */ diff --git a/src/hb-subset.hh b/src/hb-subset.hh index 1c3f41fdd..b8dd07ab2 100644 --- a/src/hb-subset.hh +++ b/src/hb-subset.hh @@ -44,14 +44,14 @@ struct hb_subset_context_t : private: template auto - _dispatch (const T &obj, hb_priority<1>, Ts &&...ds) HB_AUTO_RETURN + _dispatch (const T &obj, hb_priority<1>, Ts&&... ds) HB_AUTO_RETURN ( obj.subset (this, hb_forward (ds)...) ) template auto - _dispatch (const T &obj, hb_priority<0>, Ts &&...ds) HB_AUTO_RETURN + _dispatch (const T &obj, hb_priority<0>, Ts&&... ds) HB_AUTO_RETURN ( obj.dispatch (this, hb_forward (ds)...) ) public: template auto - dispatch (const T &obj, Ts &&...ds) HB_AUTO_RETURN + dispatch (const T &obj, Ts&&... ds) HB_AUTO_RETURN ( _dispatch (obj, hb_prioritize, hb_forward (ds)...) ) hb_subset_plan_t *plan;