Merge pull request #3154 from harfbuzz/set-invert
Resurrect hb_set_invert()
This commit is contained in:
Behdad Esfahbod
GitHub
commit
829b0f3353
|
|
@ -195,7 +195,6 @@ HB_OT_VAR_NO_AXIS_INDEX
|
|||
hb_ot_var_axis_t
|
||||
hb_ot_var_find_axis
|
||||
hb_ot_var_get_axes
|
||||
hb_set_invert
|
||||
hb_unicode_eastasian_width_func_t
|
||||
hb_unicode_eastasian_width
|
||||
hb_unicode_funcs_set_eastasian_width_func
|
||||
|
|
@ -614,6 +613,7 @@ hb_set_get_population
|
|||
hb_set_get_user_data
|
||||
hb_set_has
|
||||
hb_set_intersect
|
||||
hb_set_invert
|
||||
hb_set_is_empty
|
||||
hb_set_is_equal
|
||||
hb_set_is_subset
|
||||
|
|
|
|||
|
|
@ -19,6 +19,9 @@ HB_BASE_sources = \
|
|||
hb-array.hh \
|
||||
hb-atomic.hh \
|
||||
hb-bimap.hh \
|
||||
hb-bit-page.hh \
|
||||
hb-bit-set.hh \
|
||||
hb-bit-set-invertible.hh \
|
||||
hb-blob.cc \
|
||||
hb-blob.hh \
|
||||
hb-buffer-serialize.cc \
|
||||
|
|
|
|||
|
|
@ -1159,30 +1159,48 @@ hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *o
|
|||
|
||||
/* Operators. */
|
||||
|
||||
struct hb_bitwise_and
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_and);
|
||||
struct hb_bitwise_or
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a | b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_or);
|
||||
struct hb_bitwise_xor
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a ^ b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_xor);
|
||||
struct hb_bitwise_sub
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (~a & b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_lt);
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a & ~b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_sub);
|
||||
HB_FUNCOBJ (hb_bitwise_gt); // aka sub
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (~a | b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_le);
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T> constexpr auto
|
||||
operator () (const T &a, const T &b) const HB_AUTO_RETURN (a | ~b)
|
||||
}
|
||||
HB_FUNCOBJ (hb_bitwise_ge);
|
||||
struct
|
||||
{
|
||||
template <typename T> constexpr auto
|
||||
|
|
@ -1203,6 +1221,12 @@ struct
|
|||
}
|
||||
HB_FUNCOBJ (hb_sub);
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T, typename T2> constexpr auto
|
||||
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (b - a)
|
||||
}
|
||||
HB_FUNCOBJ (hb_rsub);
|
||||
struct
|
||||
{ HB_PARTIALIZE(2);
|
||||
template <typename T, typename T2> constexpr auto
|
||||
operator () (const T &a, const T2 &b) const HB_AUTO_RETURN (a * b)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,203 @@
|
|||
/*
|
||||
* Copyright © 2012,2017 Google, Inc.
|
||||
* Copyright © 2021 Behdad Esfahbod
|
||||
*
|
||||
* This is part of HarfBuzz, a text shaping library.
|
||||
*
|
||||
* Permission is hereby granted, without written agreement and without
|
||||
* license or royalty fees, to use, copy, modify, and distribute this
|
||||
* software and its documentation for any purpose, provided that the
|
||||
* above copyright notice and the following two paragraphs appear in
|
||||
* all copies of this software.
|
||||
*
|
||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
||||
* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
|
||||
* IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
||||
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Google Author(s): Behdad Esfahbod
|
||||
*/
|
||||
|
||||
#ifndef HB_BIT_PAGE_HH
|
||||
#define HB_BIT_PAGE_HH
|
||||
|
||||
#include "hb.hh"
|
||||
|
||||
struct hb_bit_page_t
|
||||
{
|
||||
void init0 () { v.clear (); }
|
||||
void init1 () { v.clear (0xFF); }
|
||||
|
||||
constexpr unsigned len () const
|
||||
{ return ARRAY_LENGTH_CONST (v); }
|
||||
|
||||
bool is_empty () const
|
||||
{
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
if (v[i])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void add (hb_codepoint_t g) { elt (g) |= mask (g); }
|
||||
void del (hb_codepoint_t g) { elt (g) &= ~mask (g); }
|
||||
void set (hb_codepoint_t g, bool v) { if (v) add (g); else del (g); }
|
||||
bool get (hb_codepoint_t g) const { return elt (g) & mask (g); }
|
||||
|
||||
void add_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
elt_t *la = &elt (a);
|
||||
elt_t *lb = &elt (b);
|
||||
if (la == lb)
|
||||
*la |= (mask (b) << 1) - mask(a);
|
||||
else
|
||||
{
|
||||
*la |= ~(mask (a) - 1);
|
||||
la++;
|
||||
|
||||
memset (la, 0xff, (char *) lb - (char *) la);
|
||||
|
||||
*lb |= ((mask (b) << 1) - 1);
|
||||
}
|
||||
}
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
elt_t *la = &elt (a);
|
||||
elt_t *lb = &elt (b);
|
||||
if (la == lb)
|
||||
*la &= ~((mask (b) << 1) - mask(a));
|
||||
else
|
||||
{
|
||||
*la &= mask (a) - 1;
|
||||
la++;
|
||||
|
||||
memset (la, 0, (char *) lb - (char *) la);
|
||||
|
||||
*lb &= ~((mask (b) << 1) - 1);
|
||||
}
|
||||
}
|
||||
void set_range (hb_codepoint_t a, hb_codepoint_t b, bool v)
|
||||
{ if (v) add_range (a, b); else del_range (a, b); }
|
||||
|
||||
bool is_equal (const hb_bit_page_t &other) const
|
||||
{
|
||||
return 0 == hb_memcmp (&v, &other.v, sizeof (v));
|
||||
}
|
||||
bool is_subset (const hb_bit_page_t &larger_page) const
|
||||
{
|
||||
for (unsigned i = 0; i < len (); i++)
|
||||
if (~larger_page.v[i] & v[i])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned int get_population () const
|
||||
{
|
||||
unsigned int pop = 0;
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
pop += hb_popcount (v[i]);
|
||||
return pop;
|
||||
}
|
||||
|
||||
bool next (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
unsigned int m = (*codepoint + 1) & MASK;
|
||||
if (!m)
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
unsigned int i = m / ELT_BITS;
|
||||
unsigned int j = m & ELT_MASK;
|
||||
|
||||
const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
|
||||
for (const elt_t *p = &vv; i < len (); p = &v[++i])
|
||||
if (*p)
|
||||
{
|
||||
*codepoint = i * ELT_BITS + elt_get_min (*p);
|
||||
return true;
|
||||
}
|
||||
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool previous (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
unsigned int m = (*codepoint - 1) & MASK;
|
||||
if (m == MASK)
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
unsigned int i = m / ELT_BITS;
|
||||
unsigned int j = m & ELT_MASK;
|
||||
|
||||
/* Fancy mask to avoid shifting by elt_t bitsize, which is undefined. */
|
||||
const elt_t mask = j < 8 * sizeof (elt_t) - 1 ?
|
||||
((elt_t (1) << (j + 1)) - 1) :
|
||||
(elt_t) -1;
|
||||
const elt_t vv = v[i] & mask;
|
||||
const elt_t *p = &vv;
|
||||
while (true)
|
||||
{
|
||||
if (*p)
|
||||
{
|
||||
*codepoint = i * ELT_BITS + elt_get_max (*p);
|
||||
return true;
|
||||
}
|
||||
if ((int) i <= 0) break;
|
||||
p = &v[--i];
|
||||
}
|
||||
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
hb_codepoint_t get_min () const
|
||||
{
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
if (v[i])
|
||||
return i * ELT_BITS + elt_get_min (v[i]);
|
||||
return INVALID;
|
||||
}
|
||||
hb_codepoint_t get_max () const
|
||||
{
|
||||
for (int i = len () - 1; i >= 0; i--)
|
||||
if (v[i])
|
||||
return i * ELT_BITS + elt_get_max (v[i]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static constexpr hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
|
||||
|
||||
typedef unsigned long long elt_t;
|
||||
static constexpr unsigned PAGE_BITS = 512;
|
||||
static_assert ((PAGE_BITS & ((PAGE_BITS) - 1)) == 0, "");
|
||||
|
||||
static unsigned int elt_get_min (const elt_t &elt) { return hb_ctz (elt); }
|
||||
static unsigned int elt_get_max (const elt_t &elt) { return hb_bit_storage (elt) - 1; }
|
||||
|
||||
typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t;
|
||||
|
||||
static constexpr unsigned ELT_BITS = sizeof (elt_t) * 8;
|
||||
static constexpr unsigned ELT_MASK = ELT_BITS - 1;
|
||||
static constexpr unsigned BITS = sizeof (vector_t) * 8;
|
||||
static constexpr unsigned MASK = BITS - 1;
|
||||
static_assert ((unsigned) PAGE_BITS == (unsigned) BITS, "");
|
||||
|
||||
elt_t &elt (hb_codepoint_t g) { return v[(g & MASK) / ELT_BITS]; }
|
||||
const elt_t& elt (hb_codepoint_t g) const { return v[(g & MASK) / ELT_BITS]; }
|
||||
static constexpr elt_t mask (hb_codepoint_t g) { return elt_t (1) << (g & ELT_MASK); }
|
||||
|
||||
vector_t v;
|
||||
};
|
||||
static_assert (hb_bit_page_t::PAGE_BITS == sizeof (hb_bit_page_t) * 8, "");
|
||||
|
||||
|
||||
#endif /* HB_BIT_PAGE_HH */
|
||||
|
|
@ -0,0 +1,332 @@
|
|||
/*
|
||||
* Copyright © 2012,2017 Google, Inc.
|
||||
* Copyright © 2021 Behdad Esfahbod
|
||||
*
|
||||
* This is part of HarfBuzz, a text shaping library.
|
||||
*
|
||||
* Permission is hereby granted, without written agreement and without
|
||||
* license or royalty fees, to use, copy, modify, and distribute this
|
||||
* software and its documentation for any purpose, provided that the
|
||||
* above copyright notice and the following two paragraphs appear in
|
||||
* all copies of this software.
|
||||
*
|
||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
||||
* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
|
||||
* IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
||||
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Google Author(s): Behdad Esfahbod
|
||||
*/
|
||||
|
||||
#ifndef HB_BIT_SET_INVERTIBLE_HH
|
||||
#define HB_BIT_SET_INVERTIBLE_HH
|
||||
|
||||
#include "hb.hh"
|
||||
#include "hb-bit-set.hh"
|
||||
|
||||
|
||||
struct hb_bit_set_invertible_t
|
||||
{
|
||||
hb_bit_set_t s;
|
||||
bool inverted;
|
||||
|
||||
hb_bit_set_invertible_t () { init (); }
|
||||
~hb_bit_set_invertible_t () { fini (); }
|
||||
|
||||
void init () { s.init (); inverted = false; }
|
||||
void fini () { s.fini (); }
|
||||
void err () { s.err (); }
|
||||
bool in_error () const { return s.in_error (); }
|
||||
explicit operator bool () const { return !is_empty (); }
|
||||
|
||||
void reset () { s.reset (); inverted = false; }
|
||||
void clear () { s.clear (); inverted = false; }
|
||||
void invert () { inverted = !inverted; }
|
||||
|
||||
bool is_empty () const
|
||||
{
|
||||
hb_codepoint_t v = INVALID;
|
||||
next (&v);
|
||||
return v == INVALID;
|
||||
}
|
||||
hb_codepoint_t get_min () const
|
||||
{
|
||||
hb_codepoint_t v = INVALID;
|
||||
next (&v);
|
||||
return v;
|
||||
}
|
||||
hb_codepoint_t get_max () const
|
||||
{
|
||||
hb_codepoint_t v = INVALID;
|
||||
previous (&v);
|
||||
return v;
|
||||
}
|
||||
unsigned int get_population () const
|
||||
{ return inverted ? INVALID - s.get_population () : s.get_population (); }
|
||||
|
||||
|
||||
void add (hb_codepoint_t g) { unlikely (inverted) ? s.del (g) : s.add (g); }
|
||||
bool add_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{ return unlikely (inverted) ? (s.del_range (a, b), true) : s.add_range (a, b); }
|
||||
|
||||
template <typename T>
|
||||
void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ inverted ? s.del_array (array, count, stride) : s.add_array (array, count, stride); }
|
||||
template <typename T>
|
||||
void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
|
||||
|
||||
/* Might return false if array looks unsorted.
|
||||
* Used for faster rejection of corrupt data. */
|
||||
template <typename T>
|
||||
bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ return inverted ? s.del_sorted_array (array, count, stride) : s.add_sorted_array (array, count, stride); }
|
||||
template <typename T>
|
||||
bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
|
||||
|
||||
void del (hb_codepoint_t g) { unlikely (inverted) ? s.add (g) : s.del (g); }
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{ unlikely (inverted) ? (void) s.add_range (a, b) : s.del_range (a, b); }
|
||||
|
||||
bool get (hb_codepoint_t g) const { return s.get (g) ^ inverted; }
|
||||
|
||||
/* Has interface. */
|
||||
static constexpr bool SENTINEL = false;
|
||||
typedef bool value_t;
|
||||
value_t operator [] (hb_codepoint_t k) const { return get (k); }
|
||||
bool has (hb_codepoint_t k) const { return (*this)[k] != SENTINEL; }
|
||||
/* Predicate. */
|
||||
bool operator () (hb_codepoint_t k) const { return has (k); }
|
||||
|
||||
/* Sink interface. */
|
||||
hb_bit_set_invertible_t& operator << (hb_codepoint_t v)
|
||||
{ add (v); return *this; }
|
||||
hb_bit_set_invertible_t& operator << (const hb_pair_t<hb_codepoint_t, hb_codepoint_t>& range)
|
||||
{ add_range (range.first, range.second); return *this; }
|
||||
|
||||
bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
|
||||
{
|
||||
hb_codepoint_t c = first - 1;
|
||||
return next (&c) && c <= last;
|
||||
}
|
||||
|
||||
void set (const hb_bit_set_invertible_t &other) { s.set (other.s); inverted = other.inverted; }
|
||||
|
||||
bool is_equal (const hb_bit_set_invertible_t &other) const
|
||||
{
|
||||
if (likely (inverted == other.inverted))
|
||||
return s.is_equal (other.s);
|
||||
else
|
||||
{
|
||||
/* TODO Add iter_ranges() and use here. */
|
||||
auto it1 = iter ();
|
||||
auto it2 = other.iter ();
|
||||
return hb_all (+ hb_zip (it1, it2)
|
||||
| hb_map ([](hb_pair_t<hb_codepoint_t, hb_codepoint_t> _) { return _.first == _.second; }));
|
||||
}
|
||||
}
|
||||
|
||||
bool is_subset (const hb_bit_set_invertible_t &larger_set) const
|
||||
{
|
||||
if (unlikely (inverted != larger_set.inverted))
|
||||
return hb_all (hb_iter (s) | hb_map (larger_set.s));
|
||||
else
|
||||
return unlikely (inverted) ? larger_set.s.is_subset (s) : s.is_subset (larger_set.s);
|
||||
}
|
||||
|
||||
protected:
|
||||
template <typename Op>
|
||||
void process (const Op& op, const hb_bit_set_invertible_t &other)
|
||||
{ s.process (op, other.s); }
|
||||
public:
|
||||
void union_ (const hb_bit_set_invertible_t &other)
|
||||
{
|
||||
if (likely (inverted == other.inverted))
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_and, other);
|
||||
else
|
||||
process (hb_bitwise_or, other); /* Main branch. */
|
||||
}
|
||||
else
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_gt, other);
|
||||
else
|
||||
process (hb_bitwise_lt, other);
|
||||
}
|
||||
inverted = inverted || other.inverted;
|
||||
}
|
||||
void intersect (const hb_bit_set_invertible_t &other)
|
||||
{
|
||||
if (likely (inverted == other.inverted))
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_or, other);
|
||||
else
|
||||
process (hb_bitwise_and, other); /* Main branch. */
|
||||
}
|
||||
else
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_lt, other);
|
||||
else
|
||||
process (hb_bitwise_gt, other);
|
||||
}
|
||||
inverted = inverted && other.inverted;
|
||||
}
|
||||
void subtract (const hb_bit_set_invertible_t &other)
|
||||
{
|
||||
if (likely (inverted == other.inverted))
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_lt, other);
|
||||
else
|
||||
process (hb_bitwise_gt, other); /* Main branch. */
|
||||
}
|
||||
else
|
||||
{
|
||||
if (unlikely (inverted))
|
||||
process (hb_bitwise_or, other);
|
||||
else
|
||||
process (hb_bitwise_and, other);
|
||||
}
|
||||
inverted = inverted && !other.inverted;
|
||||
}
|
||||
void symmetric_difference (const hb_bit_set_invertible_t &other)
|
||||
{
|
||||
process (hb_bitwise_xor, other);
|
||||
inverted = inverted ^ other.inverted;
|
||||
}
|
||||
|
||||
bool next (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
if (likely (!inverted))
|
||||
return s.next (codepoint);
|
||||
|
||||
auto old = *codepoint;
|
||||
if (unlikely (old + 1 == INVALID))
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
auto v = old;
|
||||
s.next (&v);
|
||||
if (old + 1 < v)
|
||||
{
|
||||
*codepoint = old + 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
v = old;
|
||||
s.next_range (&old, &v);
|
||||
|
||||
*codepoint = v + 1;
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
bool previous (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
if (likely (!inverted))
|
||||
return s.previous (codepoint);
|
||||
|
||||
auto old = *codepoint;
|
||||
if (unlikely (old - 1 == INVALID))
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
auto v = old;
|
||||
s.previous (&v);
|
||||
|
||||
if (old - 1 > v || v == INVALID)
|
||||
{
|
||||
*codepoint = old - 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
v = old;
|
||||
s.previous_range (&v, &old);
|
||||
|
||||
*codepoint = v - 1;
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
if (likely (!inverted))
|
||||
return s.next_range (first, last);
|
||||
|
||||
if (!next (last))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
*first = *last;
|
||||
s.next (last);
|
||||
--*last;
|
||||
return true;
|
||||
}
|
||||
bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
if (likely (!inverted))
|
||||
return s.previous_range (first, last);
|
||||
|
||||
if (!previous (first))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
*last = *first;
|
||||
s.previous (first);
|
||||
++*first;
|
||||
return true;
|
||||
}
|
||||
|
||||
static constexpr hb_codepoint_t INVALID = hb_bit_set_t::INVALID;
|
||||
|
||||
/*
|
||||
* Iterator implementation.
|
||||
*/
|
||||
struct iter_t : hb_iter_with_fallback_t<iter_t, hb_codepoint_t>
|
||||
{
|
||||
static constexpr bool is_sorted_iterator = true;
|
||||
iter_t (const hb_bit_set_invertible_t &s_ = Null (hb_bit_set_invertible_t),
|
||||
bool init = true) : s (&s_), v (INVALID), l(0)
|
||||
{
|
||||
if (init)
|
||||
{
|
||||
l = s->get_population () + 1;
|
||||
__next__ ();
|
||||
}
|
||||
}
|
||||
|
||||
typedef hb_codepoint_t __item_t__;
|
||||
hb_codepoint_t __item__ () const { return v; }
|
||||
bool __more__ () const { return v != INVALID; }
|
||||
void __next__ () { s->next (&v); if (l) l--; }
|
||||
void __prev__ () { s->previous (&v); }
|
||||
unsigned __len__ () const { return l; }
|
||||
iter_t end () const { return iter_t (*s, false); }
|
||||
bool operator != (const iter_t& o) const
|
||||
{ return s != o.s || v != o.v; }
|
||||
|
||||
protected:
|
||||
const hb_bit_set_invertible_t *s;
|
||||
hb_codepoint_t v;
|
||||
unsigned l;
|
||||
};
|
||||
iter_t iter () const { return iter_t (*this); }
|
||||
operator iter_t () const { return iter (); }
|
||||
};
|
||||
|
||||
|
||||
#endif /* HB_BIT_SET_INVERTIBLE_HH */
|
||||
|
|
@ -0,0 +1,810 @@
|
|||
/*
|
||||
* Copyright © 2012,2017 Google, Inc.
|
||||
* Copyright © 2021 Behdad Esfahbod
|
||||
*
|
||||
* This is part of HarfBuzz, a text shaping library.
|
||||
*
|
||||
* Permission is hereby granted, without written agreement and without
|
||||
* license or royalty fees, to use, copy, modify, and distribute this
|
||||
* software and its documentation for any purpose, provided that the
|
||||
* above copyright notice and the following two paragraphs appear in
|
||||
* all copies of this software.
|
||||
*
|
||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
||||
* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
|
||||
* IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
||||
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Google Author(s): Behdad Esfahbod
|
||||
*/
|
||||
|
||||
#ifndef HB_BIT_SET_HH
|
||||
#define HB_BIT_SET_HH
|
||||
|
||||
#include "hb.hh"
|
||||
#include "hb-bit-page.hh"
|
||||
#include "hb-machinery.hh"
|
||||
|
||||
|
||||
struct hb_bit_set_t
|
||||
{
|
||||
hb_bit_set_t () { init (); }
|
||||
~hb_bit_set_t () { fini (); }
|
||||
|
||||
void init ()
|
||||
{
|
||||
successful = true;
|
||||
population = 0;
|
||||
last_page_lookup = 0;
|
||||
page_map.init ();
|
||||
pages.init ();
|
||||
}
|
||||
void fini ()
|
||||
{
|
||||
page_map.fini ();
|
||||
pages.fini ();
|
||||
}
|
||||
|
||||
hb_bit_set_t (const hb_bit_set_t& other) : hb_bit_set_t () { set (other); }
|
||||
void operator= (const hb_bit_set_t& other) { set (other); }
|
||||
// TODO Add move construtor/assign
|
||||
// TODO Add constructor for Iterator; with specialization for (sorted) vector / array?
|
||||
|
||||
using page_t = hb_bit_page_t;
|
||||
struct page_map_t
|
||||
{
|
||||
int cmp (const page_map_t &o) const { return cmp (o.major); }
|
||||
int cmp (uint32_t o_major) const { return (int) o_major - (int) major; }
|
||||
|
||||
uint32_t major;
|
||||
uint32_t index;
|
||||
};
|
||||
|
||||
bool successful; /* Allocations successful */
|
||||
mutable unsigned int population;
|
||||
mutable unsigned int last_page_lookup;
|
||||
hb_sorted_vector_t<page_map_t> page_map;
|
||||
hb_vector_t<page_t> pages;
|
||||
|
||||
void err () { if (successful) successful = false; } /* TODO Remove */
|
||||
bool in_error () const { return !successful; }
|
||||
|
||||
bool resize (unsigned int count)
|
||||
{
|
||||
if (unlikely (count > pages.length && !successful)) return false;
|
||||
if (!pages.resize (count) || !page_map.resize (count))
|
||||
{
|
||||
pages.resize (page_map.length);
|
||||
successful = false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void reset ()
|
||||
{
|
||||
successful = true;
|
||||
clear ();
|
||||
}
|
||||
|
||||
void clear ()
|
||||
{
|
||||
if (resize (0))
|
||||
population = 0;
|
||||
}
|
||||
bool is_empty () const
|
||||
{
|
||||
unsigned int count = pages.length;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
if (!pages[i].is_empty ())
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
explicit operator bool () const { return !is_empty (); }
|
||||
|
||||
private:
|
||||
void dirty () { population = UINT_MAX; }
|
||||
public:
|
||||
|
||||
void add (hb_codepoint_t g)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
if (unlikely (g == INVALID)) return;
|
||||
dirty ();
|
||||
page_t *page = page_for (g, true); if (unlikely (!page)) return;
|
||||
page->add (g);
|
||||
}
|
||||
bool add_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
|
||||
if (unlikely (a > b || a == INVALID || b == INVALID)) return false;
|
||||
dirty ();
|
||||
unsigned int ma = get_major (a);
|
||||
unsigned int mb = get_major (b);
|
||||
if (ma == mb)
|
||||
{
|
||||
page_t *page = page_for (a, true); if (unlikely (!page)) return false;
|
||||
page->add_range (a, b);
|
||||
}
|
||||
else
|
||||
{
|
||||
page_t *page = page_for (a, true); if (unlikely (!page)) return false;
|
||||
page->add_range (a, major_start (ma + 1) - 1);
|
||||
|
||||
for (unsigned int m = ma + 1; m < mb; m++)
|
||||
{
|
||||
page = page_for (major_start (m), true); if (unlikely (!page)) return false;
|
||||
page->init1 ();
|
||||
}
|
||||
|
||||
page = page_for (b, true); if (unlikely (!page)) return false;
|
||||
page->add_range (major_start (mb), b);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void set_array (bool v, const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
if (!count) return;
|
||||
dirty ();
|
||||
hb_codepoint_t g = *array;
|
||||
while (count)
|
||||
{
|
||||
unsigned int m = get_major (g);
|
||||
page_t *page = page_for (g, v); if (unlikely (v && !page)) return;
|
||||
unsigned int start = major_start (m);
|
||||
unsigned int end = major_start (m + 1);
|
||||
do
|
||||
{
|
||||
if (v || page) /* The v check is to optimize out the page check if v is true. */
|
||||
page->set (g, v);
|
||||
|
||||
array = &StructAtOffsetUnaligned<T> (array, stride);
|
||||
count--;
|
||||
}
|
||||
while (count && (g = *array, start <= g && g < end));
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ set_array (true, array, count, stride); }
|
||||
template <typename T>
|
||||
void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
|
||||
|
||||
template <typename T>
|
||||
void del_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ set_array (false, array, count, stride); }
|
||||
template <typename T>
|
||||
void del_array (const hb_array_t<const T>& arr) { del_array (&arr, arr.len ()); }
|
||||
|
||||
/* Might return false if array looks unsorted.
|
||||
* Used for faster rejection of corrupt data. */
|
||||
template <typename T>
|
||||
bool set_sorted_array (bool v, const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{
|
||||
if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
|
||||
if (!count) return true;
|
||||
dirty ();
|
||||
hb_codepoint_t g = *array;
|
||||
hb_codepoint_t last_g = g;
|
||||
while (count)
|
||||
{
|
||||
unsigned int m = get_major (g);
|
||||
page_t *page = page_for (g, v); if (unlikely (v && !page)) return false;
|
||||
unsigned int end = major_start (m + 1);
|
||||
do
|
||||
{
|
||||
/* If we try harder we can change the following comparison to <=;
|
||||
* Not sure if it's worth it. */
|
||||
if (g < last_g) return false;
|
||||
last_g = g;
|
||||
|
||||
if (v || page) /* The v check is to optimize out the page check if v is true. */
|
||||
page->add (g);
|
||||
|
||||
array = (const T *) ((const char *) array + stride);
|
||||
count--;
|
||||
}
|
||||
while (count && (g = *array, g < end));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ return set_sorted_array (true, array, count, stride); }
|
||||
template <typename T>
|
||||
bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
|
||||
|
||||
template <typename T>
|
||||
bool del_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{ return set_sorted_array (false, array, count, stride); }
|
||||
template <typename T>
|
||||
bool del_sorted_array (const hb_sorted_array_t<const T>& arr) { return del_sorted_array (&arr, arr.len ()); }
|
||||
|
||||
void del (hb_codepoint_t g)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
page_t *page = page_for (g);
|
||||
if (!page)
|
||||
return;
|
||||
dirty ();
|
||||
page->del (g);
|
||||
}
|
||||
|
||||
private:
|
||||
void del_pages (int ds, int de)
|
||||
{
|
||||
if (ds <= de)
|
||||
{
|
||||
// Pre-allocate the workspace that compact() will need so we can bail on allocation failure
|
||||
// before attempting to rewrite the page map.
|
||||
hb_vector_t<unsigned> compact_workspace;
|
||||
if (unlikely (!allocate_compact_workspace (compact_workspace))) return;
|
||||
|
||||
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 (compact_workspace, write_index);
|
||||
resize (write_index);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public:
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
if (unlikely (a > b || a == INVALID)) return;
|
||||
dirty ();
|
||||
unsigned int ma = get_major (a);
|
||||
unsigned int mb = get_major (b);
|
||||
/* Delete pages from ds through de if ds <= de. */
|
||||
int ds = (a == major_start (ma))? (int) ma: (int) (ma + 1);
|
||||
int de = (b + 1 == major_start (mb + 1))? (int) mb: ((int) mb - 1);
|
||||
if (ds > de || (int) ma < ds)
|
||||
{
|
||||
page_t *page = page_for (a);
|
||||
if (page)
|
||||
{
|
||||
if (ma == mb)
|
||||
page->del_range (a, b);
|
||||
else
|
||||
page->del_range (a, major_start (ma + 1) - 1);
|
||||
}
|
||||
}
|
||||
if (de < (int) mb && ma != mb)
|
||||
{
|
||||
page_t *page = page_for (b);
|
||||
if (page)
|
||||
page->del_range (major_start (mb), b);
|
||||
}
|
||||
del_pages (ds, de);
|
||||
}
|
||||
|
||||
bool get (hb_codepoint_t g) const
|
||||
{
|
||||
const page_t *page = page_for (g);
|
||||
if (!page)
|
||||
return false;
|
||||
return page->get (g);
|
||||
}
|
||||
|
||||
/* Has interface. */
|
||||
static constexpr bool SENTINEL = false;
|
||||
typedef bool value_t;
|
||||
value_t operator [] (hb_codepoint_t k) const { return get (k); }
|
||||
bool has (hb_codepoint_t k) const { return (*this)[k] != SENTINEL; }
|
||||
/* Predicate. */
|
||||
bool operator () (hb_codepoint_t k) const { return has (k); }
|
||||
|
||||
/* Sink interface. */
|
||||
hb_bit_set_t& operator << (hb_codepoint_t v)
|
||||
{ add (v); return *this; }
|
||||
hb_bit_set_t& operator << (const hb_pair_t<hb_codepoint_t, hb_codepoint_t>& range)
|
||||
{ add_range (range.first, range.second); return *this; }
|
||||
|
||||
bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
|
||||
{
|
||||
hb_codepoint_t c = first - 1;
|
||||
return next (&c) && c <= last;
|
||||
}
|
||||
void set (const hb_bit_set_t &other)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
unsigned int count = other.pages.length;
|
||||
if (!resize (count))
|
||||
return;
|
||||
population = other.population;
|
||||
|
||||
hb_memcpy ((void *) pages, (const void *) other.pages, count * pages.item_size);
|
||||
hb_memcpy ((void *) page_map, (const void *) other.page_map, count * page_map.item_size);
|
||||
}
|
||||
|
||||
bool is_equal (const hb_bit_set_t &other) const
|
||||
{
|
||||
if (has_population () && other.has_population () &&
|
||||
get_population () != other.get_population ())
|
||||
return false;
|
||||
|
||||
unsigned int na = pages.length;
|
||||
unsigned int nb = other.pages.length;
|
||||
|
||||
unsigned int a = 0, b = 0;
|
||||
for (; a < na && b < nb; )
|
||||
{
|
||||
if (page_at (a).is_empty ()) { a++; continue; }
|
||||
if (other.page_at (b).is_empty ()) { b++; continue; }
|
||||
if (page_map[a].major != other.page_map[b].major ||
|
||||
!page_at (a).is_equal (other.page_at (b)))
|
||||
return false;
|
||||
a++;
|
||||
b++;
|
||||
}
|
||||
for (; a < na; a++)
|
||||
if (!page_at (a).is_empty ()) { return false; }
|
||||
for (; b < nb; b++)
|
||||
if (!other.page_at (b).is_empty ()) { return false; }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool is_subset (const hb_bit_set_t &larger_set) const
|
||||
{
|
||||
if (has_population () && larger_set.has_population () &&
|
||||
get_population () != larger_set.get_population ())
|
||||
return false;
|
||||
|
||||
uint32_t spi = 0;
|
||||
for (uint32_t lpi = 0; spi < page_map.length && lpi < larger_set.page_map.length; lpi++)
|
||||
{
|
||||
uint32_t spm = page_map[spi].major;
|
||||
uint32_t lpm = larger_set.page_map[lpi].major;
|
||||
auto sp = page_at (spi);
|
||||
auto lp = larger_set.page_at (lpi);
|
||||
|
||||
if (spm < lpm && !sp.is_empty ())
|
||||
return false;
|
||||
|
||||
if (lpm < spm)
|
||||
continue;
|
||||
|
||||
if (!sp.is_subset (lp))
|
||||
return false;
|
||||
|
||||
spi++;
|
||||
}
|
||||
|
||||
while (spi < page_map.length)
|
||||
if (!page_at (spi++).is_empty ())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
bool allocate_compact_workspace (hb_vector_t<unsigned>& workspace)
|
||||
{
|
||||
if (unlikely (!workspace.resize (pages.length)))
|
||||
{
|
||||
successful = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* workspace should be a pre-sized vector allocated to hold at exactly pages.length
|
||||
* elements.
|
||||
*/
|
||||
void compact (hb_vector_t<unsigned>& workspace,
|
||||
unsigned int length)
|
||||
{
|
||||
assert(workspace.length == pages.length);
|
||||
hb_vector_t<unsigned>& old_index_to_page_map_index = workspace;
|
||||
|
||||
hb_fill (old_index_to_page_map_index.writer(), 0xFFFFFFFF);
|
||||
for (unsigned i = 0; i < length; i++)
|
||||
old_index_to_page_map_index[page_map[i].index] = i;
|
||||
|
||||
compact_pages (old_index_to_page_map_index);
|
||||
}
|
||||
void compact_pages (const hb_vector_t<unsigned>& old_index_to_page_map_index)
|
||||
{
|
||||
unsigned int write_index = 0;
|
||||
for (unsigned int i = 0; i < pages.length; i++)
|
||||
{
|
||||
if (old_index_to_page_map_index[i] == 0xFFFFFFFF) continue;
|
||||
|
||||
if (write_index < i)
|
||||
pages[write_index] = pages[i];
|
||||
|
||||
page_map[old_index_to_page_map_index[i]].index = write_index;
|
||||
write_index++;
|
||||
}
|
||||
}
|
||||
public:
|
||||
|
||||
template <typename Op>
|
||||
void process (const Op& op, const hb_bit_set_t &other)
|
||||
{
|
||||
const bool passthru_left = op (1, 0);
|
||||
const bool passthru_right = op (0, 1);
|
||||
|
||||
if (unlikely (!successful)) return;
|
||||
|
||||
dirty ();
|
||||
|
||||
unsigned int na = pages.length;
|
||||
unsigned int nb = other.pages.length;
|
||||
unsigned int next_page = na;
|
||||
|
||||
unsigned int count = 0, newCount = 0;
|
||||
unsigned int a = 0, b = 0;
|
||||
unsigned int write_index = 0;
|
||||
|
||||
// Pre-allocate the workspace that compact() will need so we can bail on allocation failure
|
||||
// before attempting to rewrite the page map.
|
||||
hb_vector_t<unsigned> compact_workspace;
|
||||
if (!passthru_left && unlikely (!allocate_compact_workspace (compact_workspace))) return;
|
||||
|
||||
for (; a < na && b < nb; )
|
||||
{
|
||||
if (page_map[a].major == other.page_map[b].major)
|
||||
{
|
||||
if (!passthru_left)
|
||||
{
|
||||
// Move page_map entries that we're keeping from the left side set
|
||||
// to the front of the page_map vector. This isn't necessary if
|
||||
// passthru_left is set since no left side pages will be removed
|
||||
// in that case.
|
||||
if (write_index < a)
|
||||
page_map[write_index] = page_map[a];
|
||||
write_index++;
|
||||
}
|
||||
|
||||
count++;
|
||||
a++;
|
||||
b++;
|
||||
}
|
||||
else if (page_map[a].major < other.page_map[b].major)
|
||||
{
|
||||
if (passthru_left)
|
||||
count++;
|
||||
a++;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (passthru_right)
|
||||
count++;
|
||||
b++;
|
||||
}
|
||||
}
|
||||
if (passthru_left)
|
||||
count += na - a;
|
||||
if (passthru_right)
|
||||
count += nb - b;
|
||||
|
||||
if (!passthru_left)
|
||||
{
|
||||
na = write_index;
|
||||
next_page = write_index;
|
||||
compact (compact_workspace, write_index);
|
||||
}
|
||||
|
||||
if (!resize (count))
|
||||
return;
|
||||
|
||||
newCount = count;
|
||||
|
||||
/* Process in-place backward. */
|
||||
a = na;
|
||||
b = nb;
|
||||
for (; a && b; )
|
||||
{
|
||||
if (page_map[a - 1].major == other.page_map[b - 1].major)
|
||||
{
|
||||
a--;
|
||||
b--;
|
||||
count--;
|
||||
page_map[count] = page_map[a];
|
||||
page_at (count).v = op (page_at (a).v, other.page_at (b).v);
|
||||
}
|
||||
else if (page_map[a - 1].major > other.page_map[b - 1].major)
|
||||
{
|
||||
a--;
|
||||
if (passthru_left)
|
||||
{
|
||||
count--;
|
||||
page_map[count] = page_map[a];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
b--;
|
||||
if (passthru_right)
|
||||
{
|
||||
count--;
|
||||
page_map[count].major = other.page_map[b].major;
|
||||
page_map[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (passthru_left)
|
||||
while (a)
|
||||
{
|
||||
a--;
|
||||
count--;
|
||||
page_map[count] = page_map [a];
|
||||
}
|
||||
if (passthru_right)
|
||||
while (b)
|
||||
{
|
||||
b--;
|
||||
count--;
|
||||
page_map[count].major = other.page_map[b].major;
|
||||
page_map[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
}
|
||||
assert (!count);
|
||||
if (pages.length > newCount)
|
||||
// This resize() doesn't need to be checked because we can't get here
|
||||
// if the set is currently in_error() and this only resizes downwards
|
||||
// which will always succeed if the set is not in_error().
|
||||
resize (newCount);
|
||||
}
|
||||
|
||||
void union_ (const hb_bit_set_t &other) { process (hb_bitwise_or, other); }
|
||||
void intersect (const hb_bit_set_t &other) { process (hb_bitwise_and, other); }
|
||||
void subtract (const hb_bit_set_t &other) { process (hb_bitwise_gt, other); }
|
||||
void symmetric_difference (const hb_bit_set_t &other) { process (hb_bitwise_xor, other); }
|
||||
|
||||
bool next (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
// TODO: this should be merged with prev() as both implementations
|
||||
// are very similar.
|
||||
if (unlikely (*codepoint == INVALID)) {
|
||||
*codepoint = get_min ();
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
|
||||
const auto* page_map_array = page_map.arrayZ;
|
||||
unsigned int major = get_major (*codepoint);
|
||||
unsigned int i = last_page_lookup;
|
||||
|
||||
if (unlikely (i >= page_map.length || page_map_array[i].major != major))
|
||||
{
|
||||
page_map.bfind (major, &i, HB_NOT_FOUND_STORE_CLOSEST);
|
||||
if (i >= page_map.length) {
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
const auto* pages_array = pages.arrayZ;
|
||||
const page_map_t ¤t = page_map_array[i];
|
||||
if (likely (current.major == major))
|
||||
{
|
||||
if (pages_array[current.index].next (codepoint))
|
||||
{
|
||||
*codepoint += current.major * page_t::PAGE_BITS;
|
||||
last_page_lookup = i;
|
||||
return true;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
for (; i < page_map.length; i++)
|
||||
{
|
||||
const page_map_t ¤t = page_map.arrayZ[i];
|
||||
hb_codepoint_t m = pages_array[current.index].get_min ();
|
||||
if (m != INVALID)
|
||||
{
|
||||
*codepoint = current.major * page_t::PAGE_BITS + m;
|
||||
last_page_lookup = i;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
last_page_lookup = 0;
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool previous (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
if (unlikely (*codepoint == INVALID)) {
|
||||
*codepoint = get_max ();
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
|
||||
page_map_t map = {get_major (*codepoint), 0};
|
||||
unsigned int i;
|
||||
page_map.bfind (map, &i, HB_NOT_FOUND_STORE_CLOSEST);
|
||||
if (i < page_map.length && page_map[i].major == map.major)
|
||||
{
|
||||
if (pages[page_map[i].index].previous (codepoint))
|
||||
{
|
||||
*codepoint += page_map[i].major * page_t::PAGE_BITS;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
i--;
|
||||
for (; (int) i >= 0; i--)
|
||||
{
|
||||
hb_codepoint_t m = pages[page_map[i].index].get_max ();
|
||||
if (m != INVALID)
|
||||
{
|
||||
*codepoint = page_map[i].major * page_t::PAGE_BITS + m;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
hb_codepoint_t i;
|
||||
|
||||
i = *last;
|
||||
if (!next (&i))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* TODO Speed up. */
|
||||
*last = *first = i;
|
||||
while (next (&i) && i == *last + 1)
|
||||
(*last)++;
|
||||
|
||||
return true;
|
||||
}
|
||||
bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
hb_codepoint_t i;
|
||||
|
||||
i = *first;
|
||||
if (!previous (&i))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* TODO Speed up. */
|
||||
*last = *first = i;
|
||||
while (previous (&i) && i == *first - 1)
|
||||
(*first)--;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool has_population () const { return population != UINT_MAX; }
|
||||
unsigned int get_population () const
|
||||
{
|
||||
if (has_population ())
|
||||
return population;
|
||||
|
||||
unsigned int pop = 0;
|
||||
unsigned int count = pages.length;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
pop += pages[i].get_population ();
|
||||
|
||||
population = pop;
|
||||
return pop;
|
||||
}
|
||||
hb_codepoint_t get_min () const
|
||||
{
|
||||
unsigned count = pages.length;
|
||||
for (unsigned i = 0; i < count; i++)
|
||||
{
|
||||
const auto& map = page_map[i];
|
||||
const auto& page = pages[map.index];
|
||||
|
||||
if (!page.is_empty ())
|
||||
return map.major * page_t::PAGE_BITS + page.get_min ();
|
||||
}
|
||||
return INVALID;
|
||||
}
|
||||
hb_codepoint_t get_max () const
|
||||
{
|
||||
unsigned count = pages.length;
|
||||
for (signed i = count - 1; i >= 0; i--)
|
||||
{
|
||||
const auto& map = page_map[(unsigned) i];
|
||||
const auto& page = pages[map.index];
|
||||
|
||||
if (!page.is_empty ())
|
||||
return map.major * page_t::PAGE_BITS + page.get_max ();
|
||||
}
|
||||
return INVALID;
|
||||
}
|
||||
|
||||
static constexpr hb_codepoint_t INVALID = page_t::INVALID;
|
||||
|
||||
/*
|
||||
* Iterator implementation.
|
||||
*/
|
||||
struct iter_t : hb_iter_with_fallback_t<iter_t, hb_codepoint_t>
|
||||
{
|
||||
static constexpr bool is_sorted_iterator = true;
|
||||
iter_t (const hb_bit_set_t &s_ = Null (hb_bit_set_t),
|
||||
bool init = true) : s (&s_), v (INVALID), l(0)
|
||||
{
|
||||
if (init)
|
||||
{
|
||||
l = s->get_population () + 1;
|
||||
__next__ ();
|
||||
}
|
||||
}
|
||||
|
||||
typedef hb_codepoint_t __item_t__;
|
||||
hb_codepoint_t __item__ () const { return v; }
|
||||
bool __more__ () const { return v != INVALID; }
|
||||
void __next__ () { s->next (&v); if (l) l--; }
|
||||
void __prev__ () { s->previous (&v); }
|
||||
unsigned __len__ () const { return l; }
|
||||
iter_t end () const { return iter_t (*s, false); }
|
||||
bool operator != (const iter_t& o) const
|
||||
{ return s != o.s || v != o.v; }
|
||||
|
||||
protected:
|
||||
const hb_bit_set_t *s;
|
||||
hb_codepoint_t v;
|
||||
unsigned l;
|
||||
};
|
||||
iter_t iter () const { return iter_t (*this); }
|
||||
operator iter_t () const { return iter (); }
|
||||
|
||||
protected:
|
||||
|
||||
page_t *page_for (hb_codepoint_t g, bool insert = false)
|
||||
{
|
||||
page_map_t map = {get_major (g), pages.length};
|
||||
unsigned int i;
|
||||
if (!page_map.bfind (map, &i, HB_NOT_FOUND_STORE_CLOSEST))
|
||||
{
|
||||
if (!insert)
|
||||
return nullptr;
|
||||
|
||||
if (!resize (pages.length + 1))
|
||||
return nullptr;
|
||||
|
||||
pages[map.index].init0 ();
|
||||
memmove (page_map + i + 1,
|
||||
page_map + i,
|
||||
(page_map.length - 1 - i) * page_map.item_size);
|
||||
page_map[i] = map;
|
||||
}
|
||||
return &pages[page_map[i].index];
|
||||
}
|
||||
const page_t *page_for (hb_codepoint_t g) const
|
||||
{
|
||||
page_map_t key = {get_major (g)};
|
||||
const page_map_t *found = page_map.bsearch (key);
|
||||
if (found)
|
||||
return &pages[found->index];
|
||||
return nullptr;
|
||||
}
|
||||
page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
|
||||
const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
|
||||
unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
|
||||
hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
|
||||
};
|
||||
|
||||
|
||||
#endif /* HB_BIT_SET_HH */
|
||||
|
|
@ -107,9 +107,6 @@ hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
|
|||
hb_font_get_glyph_func_t func,
|
||||
void *user_data, hb_destroy_func_t destroy);
|
||||
|
||||
HB_EXTERN HB_DEPRECATED void
|
||||
hb_set_invert (hb_set_t *set);
|
||||
|
||||
/**
|
||||
* hb_unicode_eastasian_width_func_t:
|
||||
* @ufuncs: A Unicode-functions structure
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ hb_map_set (hb_map_t *map,
|
|||
hb_codepoint_t key,
|
||||
hb_codepoint_t value)
|
||||
{
|
||||
/* Immutable-safe. */
|
||||
map->set (key, value);
|
||||
}
|
||||
|
||||
|
|
@ -220,6 +221,7 @@ void
|
|||
hb_map_del (hb_map_t *map,
|
||||
hb_codepoint_t key)
|
||||
{
|
||||
/* Immutable-safe. */
|
||||
map->del (key);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,8 +140,6 @@ struct hb_lockable_set_t
|
|||
* Reference-count.
|
||||
*/
|
||||
|
||||
#define HB_REFERENCE_COUNT_INIT {0}
|
||||
|
||||
struct hb_reference_count_t
|
||||
{
|
||||
mutable hb_atomic_int_t ref_count;
|
||||
|
|
@ -197,6 +195,8 @@ struct hb_object_header_t
|
|||
hb_reference_count_t ref_count;
|
||||
mutable hb_atomic_int_t writable = 0;
|
||||
hb_atomic_ptr_t<hb_user_data_array_t> user_data;
|
||||
|
||||
bool is_inert () const { return !ref_count.get_relaxed (); }
|
||||
};
|
||||
#define HB_OBJECT_HEADER_STATIC {}
|
||||
|
||||
|
|
@ -234,11 +234,6 @@ static inline void hb_object_init (Type *obj)
|
|||
obj->header.user_data.init ();
|
||||
}
|
||||
template <typename Type>
|
||||
static inline bool hb_object_is_inert (const Type *obj)
|
||||
{
|
||||
return unlikely (obj->header.ref_count.is_inert ());
|
||||
}
|
||||
template <typename Type>
|
||||
static inline bool hb_object_is_valid (const Type *obj)
|
||||
{
|
||||
return likely (obj->header.ref_count.is_valid ());
|
||||
|
|
@ -257,7 +252,7 @@ template <typename Type>
|
|||
static inline Type *hb_object_reference (Type *obj)
|
||||
{
|
||||
hb_object_trace (obj, HB_FUNC);
|
||||
if (unlikely (!obj || hb_object_is_inert (obj)))
|
||||
if (unlikely (!obj || obj->header.is_inert ()))
|
||||
return obj;
|
||||
assert (hb_object_is_valid (obj));
|
||||
obj->header.ref_count.inc ();
|
||||
|
|
@ -267,7 +262,7 @@ template <typename Type>
|
|||
static inline bool hb_object_destroy (Type *obj)
|
||||
{
|
||||
hb_object_trace (obj, HB_FUNC);
|
||||
if (unlikely (!obj || hb_object_is_inert (obj)))
|
||||
if (unlikely (!obj || obj->header.is_inert ()))
|
||||
return false;
|
||||
assert (hb_object_is_valid (obj));
|
||||
if (obj->header.ref_count.dec () != 1)
|
||||
|
|
@ -295,7 +290,7 @@ static inline bool hb_object_set_user_data (Type *obj,
|
|||
hb_destroy_func_t destroy,
|
||||
hb_bool_t replace)
|
||||
{
|
||||
if (unlikely (!obj || hb_object_is_inert (obj)))
|
||||
if (unlikely (!obj || obj->header.is_inert ()))
|
||||
return false;
|
||||
assert (hb_object_is_valid (obj));
|
||||
|
||||
|
|
@ -322,7 +317,7 @@ template <typename Type>
|
|||
static inline void *hb_object_get_user_data (Type *obj,
|
||||
hb_user_data_key_t *key)
|
||||
{
|
||||
if (unlikely (!obj || hb_object_is_inert (obj)))
|
||||
if (unlikely (!obj || obj->header.is_inert ()))
|
||||
return nullptr;
|
||||
assert (hb_object_is_valid (obj));
|
||||
hb_user_data_array_t *user_data = obj->header.user_data.get ();
|
||||
|
|
|
|||
|
|
@ -3719,8 +3719,9 @@ struct GSUBGPOS
|
|||
hb_set_t alternate_feature_indices;
|
||||
if (version.to_int () >= 0x00010001u)
|
||||
(this+featureVars).closure_features (lookup_indices, &alternate_feature_indices);
|
||||
if (unlikely (alternate_feature_indices.in_error())) {
|
||||
feature_indices->successful = false;
|
||||
if (unlikely (alternate_feature_indices.in_error()))
|
||||
{
|
||||
feature_indices->err ();
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ hb_set_get_user_data (hb_set_t *set,
|
|||
hb_bool_t
|
||||
hb_set_allocation_successful (const hb_set_t *set)
|
||||
{
|
||||
return set->successful;
|
||||
return !set->in_error ();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -254,6 +254,7 @@ void
|
|||
hb_set_add (hb_set_t *set,
|
||||
hb_codepoint_t codepoint)
|
||||
{
|
||||
/* Immutible-safe. */
|
||||
set->add (codepoint);
|
||||
}
|
||||
|
||||
|
|
@ -273,6 +274,7 @@ hb_set_add_range (hb_set_t *set,
|
|||
hb_codepoint_t first,
|
||||
hb_codepoint_t last)
|
||||
{
|
||||
/* Immutible-safe. */
|
||||
set->add_range (first, last);
|
||||
}
|
||||
|
||||
|
|
@ -289,6 +291,7 @@ void
|
|||
hb_set_del (hb_set_t *set,
|
||||
hb_codepoint_t codepoint)
|
||||
{
|
||||
/* Immutible-safe. */
|
||||
set->del (codepoint);
|
||||
}
|
||||
|
||||
|
|
@ -311,6 +314,7 @@ hb_set_del_range (hb_set_t *set,
|
|||
hb_codepoint_t first,
|
||||
hb_codepoint_t last)
|
||||
{
|
||||
/* Immutible-safe. */
|
||||
set->del_range (first, last);
|
||||
}
|
||||
|
||||
|
|
@ -364,6 +368,9 @@ void
|
|||
hb_set_set (hb_set_t *set,
|
||||
const hb_set_t *other)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->set (*other);
|
||||
}
|
||||
|
||||
|
|
@ -380,6 +387,9 @@ void
|
|||
hb_set_union (hb_set_t *set,
|
||||
const hb_set_t *other)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->union_ (*other);
|
||||
}
|
||||
|
||||
|
|
@ -396,6 +406,9 @@ void
|
|||
hb_set_intersect (hb_set_t *set,
|
||||
const hb_set_t *other)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->intersect (*other);
|
||||
}
|
||||
|
||||
|
|
@ -412,6 +425,9 @@ void
|
|||
hb_set_subtract (hb_set_t *set,
|
||||
const hb_set_t *other)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->subtract (*other);
|
||||
}
|
||||
|
||||
|
|
@ -429,25 +445,28 @@ void
|
|||
hb_set_symmetric_difference (hb_set_t *set,
|
||||
const hb_set_t *other)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->symmetric_difference (*other);
|
||||
}
|
||||
|
||||
#ifndef HB_DISABLE_DEPRECATED
|
||||
/**
|
||||
* hb_set_invert:
|
||||
* @set: A set
|
||||
*
|
||||
* Inverts the contents of @set.
|
||||
*
|
||||
* Since: 0.9.10
|
||||
*
|
||||
* Deprecated: 1.6.1
|
||||
* Since: 3.0.0
|
||||
**/
|
||||
void
|
||||
hb_set_invert (hb_set_t *set HB_UNUSED)
|
||||
hb_set_invert (hb_set_t *set)
|
||||
{
|
||||
if (unlikely (hb_object_is_immutable (set)))
|
||||
return;
|
||||
|
||||
set->invert ();
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* hb_set_get_population:
|
||||
|
|
|
|||
|
|
@ -94,6 +94,9 @@ hb_set_clear (hb_set_t *set);
|
|||
HB_EXTERN hb_bool_t
|
||||
hb_set_is_empty (const hb_set_t *set);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_set_invert (hb_set_t *set);
|
||||
|
||||
HB_EXTERN hb_bool_t
|
||||
hb_set_has (const hb_set_t *set,
|
||||
hb_codepoint_t codepoint);
|
||||
|
|
|
|||
924
src/hb-set.hh
924
src/hb-set.hh
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright © 2012,2017 Google, Inc.
|
||||
* Copyright © 2021 Behdad Esfahbod
|
||||
*
|
||||
* This is part of HarfBuzz, a text shaping library.
|
||||
*
|
||||
|
|
@ -28,330 +29,47 @@
|
|||
#define HB_SET_HH
|
||||
|
||||
#include "hb.hh"
|
||||
#include "hb-machinery.hh"
|
||||
#include "hb-bit-set-invertible.hh"
|
||||
|
||||
|
||||
/*
|
||||
* hb_set_t
|
||||
*/
|
||||
|
||||
/* TODO Keep a freelist so we can release pages that are completely zeroed. At that
|
||||
* point maybe also use a sentinel value for "all-1" pages? */
|
||||
|
||||
struct hb_set_t
|
||||
template <typename impl_t>
|
||||
struct hb_sparseset_t
|
||||
{
|
||||
hb_set_t () { init (); }
|
||||
~hb_set_t () { fini (); }
|
||||
|
||||
hb_set_t (const hb_set_t& other) : hb_set_t () { set (other); }
|
||||
void operator= (const hb_set_t& other) { set (other); }
|
||||
// TODO Add move construtor/assign
|
||||
// TODO Add constructor for Iterator; with specialization for (sorted) vector / array?
|
||||
|
||||
struct page_map_t
|
||||
{
|
||||
int cmp (const page_map_t &o) const { return (int) o.major - (int) major; }
|
||||
int cmp (uint32_t o_major) const { return (int) o_major - (int) major; }
|
||||
|
||||
uint32_t major;
|
||||
uint32_t index;
|
||||
};
|
||||
|
||||
struct page_t
|
||||
{
|
||||
void init0 () { v.clear (); }
|
||||
void init1 () { v.clear (0xFF); }
|
||||
|
||||
constexpr unsigned len () const
|
||||
{ return ARRAY_LENGTH_CONST (v); }
|
||||
|
||||
bool is_empty () const
|
||||
{
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
if (v[i])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void add (hb_codepoint_t g) { elt (g) |= mask (g); }
|
||||
void del (hb_codepoint_t g) { elt (g) &= ~mask (g); }
|
||||
bool get (hb_codepoint_t g) const { return elt (g) & mask (g); }
|
||||
|
||||
void add_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
elt_t *la = &elt (a);
|
||||
elt_t *lb = &elt (b);
|
||||
if (la == lb)
|
||||
*la |= (mask (b) << 1) - mask(a);
|
||||
else
|
||||
{
|
||||
*la |= ~(mask (a) - 1);
|
||||
la++;
|
||||
|
||||
memset (la, 0xff, (char *) lb - (char *) la);
|
||||
|
||||
*lb |= ((mask (b) << 1) - 1);
|
||||
}
|
||||
}
|
||||
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
elt_t *la = &elt (a);
|
||||
elt_t *lb = &elt (b);
|
||||
if (la == lb)
|
||||
*la &= ~((mask (b) << 1) - mask(a));
|
||||
else
|
||||
{
|
||||
*la &= mask (a) - 1;
|
||||
la++;
|
||||
|
||||
memset (la, 0, (char *) lb - (char *) la);
|
||||
|
||||
*lb &= ~((mask (b) << 1) - 1);
|
||||
}
|
||||
}
|
||||
|
||||
bool is_equal (const page_t &other) const
|
||||
{
|
||||
return 0 == hb_memcmp (&v, &other.v, sizeof (v));
|
||||
}
|
||||
bool is_subset (const page_t &larger_page) const
|
||||
{
|
||||
for (unsigned i = 0; i < len (); i++)
|
||||
if (~larger_page.v[i] & v[i])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned int get_population () const
|
||||
{
|
||||
unsigned int pop = 0;
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
pop += hb_popcount (v[i]);
|
||||
return pop;
|
||||
}
|
||||
|
||||
bool next (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
unsigned int m = (*codepoint + 1) & MASK;
|
||||
if (!m)
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
unsigned int i = m / ELT_BITS;
|
||||
unsigned int j = m & ELT_MASK;
|
||||
|
||||
const elt_t vv = v[i] & ~((elt_t (1) << j) - 1);
|
||||
for (const elt_t *p = &vv; i < len (); p = &v[++i])
|
||||
if (*p)
|
||||
{
|
||||
*codepoint = i * ELT_BITS + elt_get_min (*p);
|
||||
return true;
|
||||
}
|
||||
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool previous (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
unsigned int m = (*codepoint - 1) & MASK;
|
||||
if (m == MASK)
|
||||
{
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
unsigned int i = m / ELT_BITS;
|
||||
unsigned int j = m & ELT_MASK;
|
||||
|
||||
/* Fancy mask to avoid shifting by elt_t bitsize, which is undefined. */
|
||||
const elt_t mask = j < 8 * sizeof (elt_t) - 1 ?
|
||||
((elt_t (1) << (j + 1)) - 1) :
|
||||
(elt_t) -1;
|
||||
const elt_t vv = v[i] & mask;
|
||||
const elt_t *p = &vv;
|
||||
while (true)
|
||||
{
|
||||
if (*p)
|
||||
{
|
||||
*codepoint = i * ELT_BITS + elt_get_max (*p);
|
||||
return true;
|
||||
}
|
||||
if ((int) i <= 0) break;
|
||||
p = &v[--i];
|
||||
}
|
||||
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
hb_codepoint_t get_min () const
|
||||
{
|
||||
for (unsigned int i = 0; i < len (); i++)
|
||||
if (v[i])
|
||||
return i * ELT_BITS + elt_get_min (v[i]);
|
||||
return INVALID;
|
||||
}
|
||||
hb_codepoint_t get_max () const
|
||||
{
|
||||
for (int i = len () - 1; i >= 0; i--)
|
||||
if (v[i])
|
||||
return i * ELT_BITS + elt_get_max (v[i]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef unsigned long long elt_t;
|
||||
static constexpr unsigned PAGE_BITS = 512;
|
||||
static_assert ((PAGE_BITS & ((PAGE_BITS) - 1)) == 0, "");
|
||||
|
||||
static unsigned int elt_get_min (const elt_t &elt) { return hb_ctz (elt); }
|
||||
static unsigned int elt_get_max (const elt_t &elt) { return hb_bit_storage (elt) - 1; }
|
||||
|
||||
typedef hb_vector_size_t<elt_t, PAGE_BITS / 8> vector_t;
|
||||
|
||||
static constexpr unsigned ELT_BITS = sizeof (elt_t) * 8;
|
||||
static constexpr unsigned ELT_MASK = ELT_BITS - 1;
|
||||
static constexpr unsigned BITS = sizeof (vector_t) * 8;
|
||||
static constexpr unsigned MASK = BITS - 1;
|
||||
static_assert ((unsigned) PAGE_BITS == (unsigned) BITS, "");
|
||||
|
||||
elt_t &elt (hb_codepoint_t g) { return v[(g & MASK) / ELT_BITS]; }
|
||||
const elt_t& elt (hb_codepoint_t g) const { return v[(g & MASK) / ELT_BITS]; }
|
||||
static constexpr elt_t mask (hb_codepoint_t g) { return elt_t (1) << (g & ELT_MASK); }
|
||||
|
||||
vector_t v;
|
||||
};
|
||||
static_assert (page_t::PAGE_BITS == sizeof (page_t) * 8, "");
|
||||
|
||||
hb_object_header_t header;
|
||||
bool successful; /* Allocations successful */
|
||||
mutable unsigned int population;
|
||||
mutable unsigned int last_page_lookup;
|
||||
hb_sorted_vector_t<page_map_t> page_map;
|
||||
hb_vector_t<page_t> pages;
|
||||
impl_t s;
|
||||
|
||||
void init_shallow ()
|
||||
{
|
||||
successful = true;
|
||||
population = 0;
|
||||
last_page_lookup = 0;
|
||||
page_map.init ();
|
||||
pages.init ();
|
||||
}
|
||||
hb_sparseset_t () { init (); }
|
||||
~hb_sparseset_t () { fini (); }
|
||||
|
||||
void init_shallow () { s.init (); }
|
||||
void init ()
|
||||
{
|
||||
hb_object_init (this);
|
||||
init_shallow ();
|
||||
}
|
||||
void fini_shallow ()
|
||||
{
|
||||
population = 0;
|
||||
last_page_lookup = 0;
|
||||
page_map.fini ();
|
||||
pages.fini ();
|
||||
}
|
||||
void fini_shallow () { s.fini (); }
|
||||
void fini ()
|
||||
{
|
||||
hb_object_fini (this);
|
||||
fini_shallow ();
|
||||
}
|
||||
|
||||
bool in_error () const { return !successful; }
|
||||
|
||||
bool resize (unsigned int count)
|
||||
{
|
||||
if (unlikely (count > pages.length && !successful)) return false;
|
||||
if (!pages.resize (count) || !page_map.resize (count))
|
||||
{
|
||||
pages.resize (page_map.length);
|
||||
successful = false;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void reset ()
|
||||
{
|
||||
successful = true;
|
||||
clear ();
|
||||
}
|
||||
|
||||
void clear ()
|
||||
{
|
||||
if (resize (0))
|
||||
population = 0;
|
||||
}
|
||||
bool is_empty () const
|
||||
{
|
||||
unsigned int count = pages.length;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
if (!pages[i].is_empty ())
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
explicit operator bool () const { return !is_empty (); }
|
||||
|
||||
void dirty () { population = UINT_MAX; }
|
||||
void err () { s.err (); }
|
||||
bool in_error () const { return s.in_error (); }
|
||||
|
||||
void add (hb_codepoint_t g)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
if (unlikely (g == INVALID)) return;
|
||||
dirty ();
|
||||
page_t *page = page_for_insert (g); if (unlikely (!page)) return;
|
||||
page->add (g);
|
||||
}
|
||||
bool add_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
|
||||
if (unlikely (a > b || a == INVALID || b == INVALID)) return false;
|
||||
dirty ();
|
||||
unsigned int ma = get_major (a);
|
||||
unsigned int mb = get_major (b);
|
||||
if (ma == mb)
|
||||
{
|
||||
page_t *page = page_for_insert (a); if (unlikely (!page)) return false;
|
||||
page->add_range (a, b);
|
||||
}
|
||||
else
|
||||
{
|
||||
page_t *page = page_for_insert (a); if (unlikely (!page)) return false;
|
||||
page->add_range (a, major_start (ma + 1) - 1);
|
||||
void reset () { s.reset (); }
|
||||
void clear () { s.clear (); }
|
||||
void invert () { s.invert (); }
|
||||
bool is_empty () const { return s.is_empty (); }
|
||||
|
||||
for (unsigned int m = ma + 1; m < mb; m++)
|
||||
{
|
||||
page = page_for_insert (major_start (m)); if (unlikely (!page)) return false;
|
||||
page->init1 ();
|
||||
}
|
||||
|
||||
page = page_for_insert (b); if (unlikely (!page)) return false;
|
||||
page->add_range (major_start (mb), b);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
void add (hb_codepoint_t g) { s.add (g); }
|
||||
bool add_range (hb_codepoint_t a, hb_codepoint_t b) { return s.add_range (a, b); }
|
||||
|
||||
template <typename T>
|
||||
void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
if (!count) return;
|
||||
dirty ();
|
||||
hb_codepoint_t g = *array;
|
||||
while (count)
|
||||
{
|
||||
unsigned int m = get_major (g);
|
||||
page_t *page = page_for_insert (g); if (unlikely (!page)) return;
|
||||
unsigned int start = major_start (m);
|
||||
unsigned int end = major_start (m + 1);
|
||||
do
|
||||
{
|
||||
page->add (g);
|
||||
|
||||
array = &StructAtOffsetUnaligned<T> (array, stride);
|
||||
count--;
|
||||
}
|
||||
while (count && (g = *array, start <= g && g < end));
|
||||
}
|
||||
}
|
||||
{ s.add_array (array, count, stride); }
|
||||
template <typename T>
|
||||
void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
|
||||
|
||||
|
|
@ -359,108 +77,14 @@ struct hb_set_t
|
|||
* Used for faster rejection of corrupt data. */
|
||||
template <typename T>
|
||||
bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
|
||||
{
|
||||
if (unlikely (!successful)) return true; /* https://github.com/harfbuzz/harfbuzz/issues/657 */
|
||||
if (!count) return true;
|
||||
dirty ();
|
||||
hb_codepoint_t g = *array;
|
||||
hb_codepoint_t last_g = g;
|
||||
while (count)
|
||||
{
|
||||
unsigned int m = get_major (g);
|
||||
page_t *page = page_for_insert (g); if (unlikely (!page)) return false;
|
||||
unsigned int end = major_start (m + 1);
|
||||
do
|
||||
{
|
||||
/* If we try harder we can change the following comparison to <=;
|
||||
* Not sure if it's worth it. */
|
||||
if (g < last_g) return false;
|
||||
last_g = g;
|
||||
page->add (g);
|
||||
|
||||
array = (const T *) ((const char *) array + stride);
|
||||
count--;
|
||||
}
|
||||
while (count && (g = *array, g < end));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
{ return s.add_sorted_array (array, count, stride); }
|
||||
template <typename T>
|
||||
bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
|
||||
|
||||
void del (hb_codepoint_t g)
|
||||
{
|
||||
/* TODO perform op even if !successful. */
|
||||
if (unlikely (!successful)) return;
|
||||
page_t *page = page_for (g);
|
||||
if (!page)
|
||||
return;
|
||||
dirty ();
|
||||
page->del (g);
|
||||
}
|
||||
void del (hb_codepoint_t g) { s.del (g); }
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b) { s.del_range (a, b); }
|
||||
|
||||
private:
|
||||
void del_pages (int ds, int de)
|
||||
{
|
||||
if (ds <= de)
|
||||
{
|
||||
// Pre-allocate the workspace that compact() will need so we can bail on allocation failure
|
||||
// before attempting to rewrite the page map.
|
||||
hb_vector_t<unsigned> compact_workspace;
|
||||
if (unlikely (!allocate_compact_workspace (compact_workspace))) return;
|
||||
|
||||
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 (compact_workspace, write_index);
|
||||
resize (write_index);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public:
|
||||
void del_range (hb_codepoint_t a, hb_codepoint_t b)
|
||||
{
|
||||
/* TODO perform op even if !successful. */
|
||||
if (unlikely (!successful)) return;
|
||||
if (unlikely (a > b || a == INVALID)) return;
|
||||
dirty ();
|
||||
unsigned int ma = get_major (a);
|
||||
unsigned int mb = get_major (b);
|
||||
/* Delete pages from ds through de if ds <= de. */
|
||||
int ds = (a == major_start (ma))? (int) ma: (int) (ma + 1);
|
||||
int de = (b + 1 == major_start (mb + 1))? (int) mb: ((int) mb - 1);
|
||||
if (ds > de || (int) ma < ds)
|
||||
{
|
||||
page_t *page = page_for (a);
|
||||
if (page)
|
||||
{
|
||||
if (ma == mb)
|
||||
page->del_range (a, b);
|
||||
else
|
||||
page->del_range (a, major_start (ma + 1) - 1);
|
||||
}
|
||||
}
|
||||
if (de < (int) mb && ma != mb)
|
||||
{
|
||||
page_t *page = page_for (b);
|
||||
if (page)
|
||||
page->del_range (major_start (mb), b);
|
||||
}
|
||||
del_pages (ds, de);
|
||||
}
|
||||
|
||||
bool get (hb_codepoint_t g) const
|
||||
{
|
||||
const page_t *page = page_for (g);
|
||||
if (!page)
|
||||
return false;
|
||||
return page->get (g);
|
||||
}
|
||||
bool get (hb_codepoint_t g) const { return s.get (g); }
|
||||
|
||||
/* Has interface. */
|
||||
static constexpr bool SENTINEL = false;
|
||||
|
|
@ -471,503 +95,49 @@ struct hb_set_t
|
|||
bool operator () (hb_codepoint_t k) const { return has (k); }
|
||||
|
||||
/* Sink interface. */
|
||||
hb_set_t& operator << (hb_codepoint_t v)
|
||||
hb_sparseset_t& operator << (hb_codepoint_t v)
|
||||
{ add (v); return *this; }
|
||||
hb_set_t& operator << (const hb_pair_t<hb_codepoint_t, hb_codepoint_t>& range)
|
||||
hb_sparseset_t& operator << (const hb_pair_t<hb_codepoint_t, hb_codepoint_t>& range)
|
||||
{ add_range (range.first, range.second); return *this; }
|
||||
|
||||
bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
|
||||
{
|
||||
hb_codepoint_t c = first - 1;
|
||||
return next (&c) && c <= last;
|
||||
}
|
||||
void set (const hb_set_t &other)
|
||||
{
|
||||
if (unlikely (!successful)) return;
|
||||
unsigned int count = other.pages.length;
|
||||
if (!resize (count))
|
||||
return;
|
||||
population = other.population;
|
||||
{ return s.intersects (first, last); }
|
||||
|
||||
hb_memcpy ((void *) pages, (const void *) other.pages, count * pages.item_size);
|
||||
hb_memcpy ((void *) page_map, (const void *) other.page_map, count * page_map.item_size);
|
||||
}
|
||||
void set (const hb_sparseset_t &other) { s.set (other.s); }
|
||||
|
||||
bool is_equal (const hb_set_t &other) const
|
||||
{
|
||||
if (get_population () != other.get_population ())
|
||||
return false;
|
||||
bool is_equal (const hb_sparseset_t &other) const { return s.is_equal (other.s); }
|
||||
|
||||
unsigned int na = pages.length;
|
||||
unsigned int nb = other.pages.length;
|
||||
bool is_subset (const hb_sparseset_t &larger_set) const { return s.is_subset (larger_set.s); }
|
||||
|
||||
unsigned int a = 0, b = 0;
|
||||
for (; a < na && b < nb; )
|
||||
{
|
||||
if (page_at (a).is_empty ()) { a++; continue; }
|
||||
if (other.page_at (b).is_empty ()) { b++; continue; }
|
||||
if (page_map[a].major != other.page_map[b].major ||
|
||||
!page_at (a).is_equal (other.page_at (b)))
|
||||
return false;
|
||||
a++;
|
||||
b++;
|
||||
}
|
||||
for (; a < na; a++)
|
||||
if (!page_at (a).is_empty ()) { return false; }
|
||||
for (; b < nb; b++)
|
||||
if (!other.page_at (b).is_empty ()) { return false; }
|
||||
void union_ (const hb_sparseset_t &other) { s.union_ (other.s); }
|
||||
void intersect (const hb_sparseset_t &other) { s.intersect (other.s); }
|
||||
void subtract (const hb_sparseset_t &other) { s.subtract (other.s); }
|
||||
void symmetric_difference (const hb_sparseset_t &other) { s.symmetric_difference (other.s); }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool is_subset (const hb_set_t &larger_set) const
|
||||
{
|
||||
/* TODO: Merge this and is_equal() into something like process(). */
|
||||
if (unlikely(larger_set.is_empty ()))
|
||||
return is_empty ();
|
||||
|
||||
uint32_t spi = 0;
|
||||
for (uint32_t lpi = 0; spi < page_map.length && lpi < larger_set.page_map.length; lpi++)
|
||||
{
|
||||
uint32_t spm = page_map[spi].major;
|
||||
uint32_t lpm = larger_set.page_map[lpi].major;
|
||||
auto sp = page_at (spi);
|
||||
auto lp = larger_set.page_at (lpi);
|
||||
|
||||
if (spm < lpm && !sp.is_empty ())
|
||||
return false;
|
||||
|
||||
if (lpm < spm)
|
||||
continue;
|
||||
|
||||
if (!sp.is_subset (lp))
|
||||
return false;
|
||||
|
||||
spi++;
|
||||
}
|
||||
|
||||
while (spi < page_map.length)
|
||||
if (!page_at (spi++).is_empty ())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool allocate_compact_workspace(hb_vector_t<unsigned>& workspace)
|
||||
{
|
||||
if (unlikely(!workspace.resize (pages.length)))
|
||||
{
|
||||
successful = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* workspace should be a pre-sized vector allocated to hold at exactly pages.length
|
||||
* elements.
|
||||
*/
|
||||
void compact (hb_vector_t<unsigned>& workspace,
|
||||
unsigned int length)
|
||||
{
|
||||
assert(workspace.length == pages.length);
|
||||
hb_vector_t<unsigned>& old_index_to_page_map_index = workspace;
|
||||
|
||||
hb_fill (old_index_to_page_map_index.writer(), 0xFFFFFFFF);
|
||||
/* TODO(iter) Rewrite as dagger? */
|
||||
for (unsigned i = 0; i < length; i++)
|
||||
old_index_to_page_map_index[page_map[i].index] = i;
|
||||
|
||||
compact_pages (old_index_to_page_map_index);
|
||||
}
|
||||
|
||||
void compact_pages (const hb_vector_t<unsigned>& old_index_to_page_map_index)
|
||||
{
|
||||
unsigned int write_index = 0;
|
||||
for (unsigned int i = 0; i < pages.length; i++)
|
||||
{
|
||||
if (old_index_to_page_map_index[i] == 0xFFFFFFFF) continue;
|
||||
|
||||
if (write_index < i)
|
||||
pages[write_index] = pages[i];
|
||||
|
||||
page_map[old_index_to_page_map_index[i]].index = write_index;
|
||||
write_index++;
|
||||
}
|
||||
}
|
||||
|
||||
template <typename Op>
|
||||
void process (const Op& op, const hb_set_t &other)
|
||||
{
|
||||
const bool passthru_left = op (1, 0);
|
||||
const bool passthru_right = op (0, 1);
|
||||
|
||||
if (unlikely (!successful)) return;
|
||||
|
||||
dirty ();
|
||||
|
||||
unsigned int na = pages.length;
|
||||
unsigned int nb = other.pages.length;
|
||||
unsigned int next_page = na;
|
||||
|
||||
unsigned int count = 0, newCount = 0;
|
||||
unsigned int a = 0, b = 0;
|
||||
unsigned int write_index = 0;
|
||||
|
||||
// Pre-allocate the workspace that compact() will need so we can bail on allocation failure
|
||||
// before attempting to rewrite the page map.
|
||||
hb_vector_t<unsigned> compact_workspace;
|
||||
if (!passthru_left && unlikely (!allocate_compact_workspace (compact_workspace))) return;
|
||||
|
||||
for (; a < na && b < nb; )
|
||||
{
|
||||
if (page_map[a].major == other.page_map[b].major)
|
||||
{
|
||||
if (!passthru_left)
|
||||
{
|
||||
// Move page_map entries that we're keeping from the left side set
|
||||
// to the front of the page_map vector. This isn't necessary if
|
||||
// passthru_left is set since no left side pages will be removed
|
||||
// in that case.
|
||||
if (write_index < a)
|
||||
page_map[write_index] = page_map[a];
|
||||
write_index++;
|
||||
}
|
||||
|
||||
count++;
|
||||
a++;
|
||||
b++;
|
||||
}
|
||||
else if (page_map[a].major < other.page_map[b].major)
|
||||
{
|
||||
if (passthru_left)
|
||||
count++;
|
||||
a++;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (passthru_right)
|
||||
count++;
|
||||
b++;
|
||||
}
|
||||
}
|
||||
if (passthru_left)
|
||||
count += na - a;
|
||||
if (passthru_right)
|
||||
count += nb - b;
|
||||
|
||||
if (!passthru_left)
|
||||
{
|
||||
na = write_index;
|
||||
next_page = write_index;
|
||||
compact (compact_workspace, write_index);
|
||||
}
|
||||
|
||||
if (!resize (count))
|
||||
return;
|
||||
|
||||
newCount = count;
|
||||
|
||||
/* Process in-place backward. */
|
||||
a = na;
|
||||
b = nb;
|
||||
for (; a && b; )
|
||||
{
|
||||
if (page_map[a - 1].major == other.page_map[b - 1].major)
|
||||
{
|
||||
a--;
|
||||
b--;
|
||||
count--;
|
||||
page_map[count] = page_map[a];
|
||||
page_at (count).v = op (page_at (a).v, other.page_at (b).v);
|
||||
}
|
||||
else if (page_map[a - 1].major > other.page_map[b - 1].major)
|
||||
{
|
||||
a--;
|
||||
if (passthru_left)
|
||||
{
|
||||
count--;
|
||||
page_map[count] = page_map[a];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
b--;
|
||||
if (passthru_right)
|
||||
{
|
||||
count--;
|
||||
page_map[count].major = other.page_map[b].major;
|
||||
page_map[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (passthru_left)
|
||||
while (a)
|
||||
{
|
||||
a--;
|
||||
count--;
|
||||
page_map[count] = page_map [a];
|
||||
}
|
||||
if (passthru_right)
|
||||
while (b)
|
||||
{
|
||||
b--;
|
||||
count--;
|
||||
page_map[count].major = other.page_map[b].major;
|
||||
page_map[count].index = next_page++;
|
||||
page_at (count).v = other.page_at (b).v;
|
||||
}
|
||||
assert (!count);
|
||||
if (pages.length > newCount)
|
||||
// This resize() doesn't need to be checked because we can't get here
|
||||
// if the set is currently in_error() and this only resizes downwards
|
||||
// which will always succeed if the set is not in_error().
|
||||
resize (newCount);
|
||||
}
|
||||
|
||||
void union_ (const hb_set_t &other)
|
||||
{
|
||||
process (hb_bitwise_or, other);
|
||||
}
|
||||
void intersect (const hb_set_t &other)
|
||||
{
|
||||
process (hb_bitwise_and, other);
|
||||
}
|
||||
void subtract (const hb_set_t &other)
|
||||
{
|
||||
process (hb_bitwise_sub, other);
|
||||
}
|
||||
void symmetric_difference (const hb_set_t &other)
|
||||
{
|
||||
process (hb_bitwise_xor, other);
|
||||
}
|
||||
bool next (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
// TODO: this should be merged with prev() as both implementations
|
||||
// are very similar.
|
||||
if (unlikely (*codepoint == INVALID)) {
|
||||
*codepoint = get_min ();
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
|
||||
const auto* page_map_array = page_map.arrayZ;
|
||||
unsigned int major = get_major (*codepoint);
|
||||
unsigned int i = last_page_lookup;
|
||||
|
||||
if (unlikely (i >= page_map.length || page_map_array[i].major != major))
|
||||
{
|
||||
page_map.bfind (major, &i, HB_NOT_FOUND_STORE_CLOSEST);
|
||||
if (i >= page_map.length) {
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
const auto* pages_array = pages.arrayZ;
|
||||
const page_map_t ¤t = page_map_array[i];
|
||||
if (likely (current.major == major))
|
||||
{
|
||||
if (pages_array[current.index].next (codepoint))
|
||||
{
|
||||
*codepoint += current.major * page_t::PAGE_BITS;
|
||||
last_page_lookup = i;
|
||||
return true;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
for (; i < page_map.length; i++)
|
||||
{
|
||||
const page_map_t ¤t = page_map.arrayZ[i];
|
||||
hb_codepoint_t m = pages_array[current.index].get_min ();
|
||||
if (m != INVALID)
|
||||
{
|
||||
*codepoint = current.major * page_t::PAGE_BITS + m;
|
||||
last_page_lookup = i;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
last_page_lookup = 0;
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool previous (hb_codepoint_t *codepoint) const
|
||||
{
|
||||
if (unlikely (*codepoint == INVALID)) {
|
||||
*codepoint = get_max ();
|
||||
return *codepoint != INVALID;
|
||||
}
|
||||
|
||||
page_map_t map = {get_major (*codepoint), 0};
|
||||
unsigned int i;
|
||||
page_map.bfind (map, &i, HB_NOT_FOUND_STORE_CLOSEST);
|
||||
if (i < page_map.length && page_map[i].major == map.major)
|
||||
{
|
||||
if (pages[page_map[i].index].previous (codepoint))
|
||||
{
|
||||
*codepoint += page_map[i].major * page_t::PAGE_BITS;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
i--;
|
||||
for (; (int) i >= 0; i--)
|
||||
{
|
||||
hb_codepoint_t m = pages[page_map[i].index].get_max ();
|
||||
if (m != INVALID)
|
||||
{
|
||||
*codepoint = page_map[i].major * page_t::PAGE_BITS + m;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
*codepoint = INVALID;
|
||||
return false;
|
||||
}
|
||||
bool next (hb_codepoint_t *codepoint) const { return s.next (codepoint); }
|
||||
bool previous (hb_codepoint_t *codepoint) const { return s.previous (codepoint); }
|
||||
bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
hb_codepoint_t i;
|
||||
|
||||
i = *last;
|
||||
if (!next (&i))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* TODO Speed up. */
|
||||
*last = *first = i;
|
||||
while (next (&i) && i == *last + 1)
|
||||
(*last)++;
|
||||
|
||||
return true;
|
||||
}
|
||||
{ return s.next_range (first, last); }
|
||||
bool previous_range (hb_codepoint_t *first, hb_codepoint_t *last) const
|
||||
{
|
||||
hb_codepoint_t i;
|
||||
{ return s.previous_range (first, last); }
|
||||
|
||||
i = *first;
|
||||
if (!previous (&i))
|
||||
{
|
||||
*last = *first = INVALID;
|
||||
return false;
|
||||
}
|
||||
unsigned int get_population () const { return s.get_population (); }
|
||||
hb_codepoint_t get_min () const { return s.get_min (); }
|
||||
hb_codepoint_t get_max () const { return s.get_max (); }
|
||||
|
||||
/* TODO Speed up. */
|
||||
*last = *first = i;
|
||||
while (previous (&i) && i == *first - 1)
|
||||
(*first)--;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
unsigned int get_population () const
|
||||
{
|
||||
if (population != UINT_MAX)
|
||||
return population;
|
||||
|
||||
unsigned int pop = 0;
|
||||
unsigned int count = pages.length;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
pop += pages[i].get_population ();
|
||||
|
||||
population = pop;
|
||||
return pop;
|
||||
}
|
||||
hb_codepoint_t get_min () const
|
||||
{
|
||||
unsigned int count = pages.length;
|
||||
for (unsigned int i = 0; i < count; i++)
|
||||
if (!page_at (i).is_empty ())
|
||||
return page_map[i].major * page_t::PAGE_BITS + page_at (i).get_min ();
|
||||
return INVALID;
|
||||
}
|
||||
hb_codepoint_t get_max () const
|
||||
{
|
||||
unsigned int count = pages.length;
|
||||
for (int i = count - 1; i >= 0; i--)
|
||||
if (!page_at (i).is_empty ())
|
||||
return page_map[(unsigned) i].major * page_t::PAGE_BITS + page_at (i).get_max ();
|
||||
return INVALID;
|
||||
}
|
||||
|
||||
static constexpr hb_codepoint_t INVALID = HB_SET_VALUE_INVALID;
|
||||
static constexpr hb_codepoint_t INVALID = impl_t::INVALID;
|
||||
|
||||
/*
|
||||
* Iterator implementation.
|
||||
*/
|
||||
struct iter_t : hb_iter_with_fallback_t<iter_t, hb_codepoint_t>
|
||||
{
|
||||
static constexpr bool is_sorted_iterator = true;
|
||||
iter_t (const hb_set_t &s_ = Null (hb_set_t),
|
||||
bool init = true) : s (&s_), v (INVALID), l(0)
|
||||
{
|
||||
if (init)
|
||||
{
|
||||
l = s->get_population () + 1;
|
||||
__next__ ();
|
||||
}
|
||||
}
|
||||
|
||||
typedef hb_codepoint_t __item_t__;
|
||||
hb_codepoint_t __item__ () const { return v; }
|
||||
bool __more__ () const { return v != INVALID; }
|
||||
void __next__ () { s->next (&v); if (l) l--; }
|
||||
void __prev__ () { s->previous (&v); }
|
||||
unsigned __len__ () const { return l; }
|
||||
iter_t end () const { return iter_t (*s, false); }
|
||||
bool operator != (const iter_t& o) const
|
||||
{ return s != o.s || v != o.v; }
|
||||
|
||||
protected:
|
||||
const hb_set_t *s;
|
||||
hb_codepoint_t v;
|
||||
unsigned l;
|
||||
};
|
||||
iter_t iter () const { return iter_t (*this); }
|
||||
using iter_t = typename impl_t::iter_t;
|
||||
iter_t iter () const { return iter_t (this->s); }
|
||||
operator iter_t () const { return iter (); }
|
||||
|
||||
protected:
|
||||
|
||||
page_t *page_for_insert (hb_codepoint_t g)
|
||||
{
|
||||
page_map_t map = {get_major (g), pages.length};
|
||||
unsigned int i;
|
||||
if (!page_map.bfind (map, &i, HB_NOT_FOUND_STORE_CLOSEST))
|
||||
{
|
||||
if (!resize (pages.length + 1))
|
||||
return nullptr;
|
||||
|
||||
pages[map.index].init0 ();
|
||||
memmove (page_map + i + 1,
|
||||
page_map + i,
|
||||
(page_map.length - 1 - i) * page_map.item_size);
|
||||
page_map[i] = map;
|
||||
}
|
||||
return &pages[page_map[i].index];
|
||||
}
|
||||
page_t *page_for (hb_codepoint_t g)
|
||||
{
|
||||
page_map_t key = {get_major (g)};
|
||||
const page_map_t *found = page_map.bsearch (key);
|
||||
if (found)
|
||||
return &pages[found->index];
|
||||
return nullptr;
|
||||
}
|
||||
const page_t *page_for (hb_codepoint_t g) const
|
||||
{
|
||||
page_map_t key = {get_major (g)};
|
||||
const page_map_t *found = page_map.bsearch (key);
|
||||
if (found)
|
||||
return &pages[found->index];
|
||||
return nullptr;
|
||||
}
|
||||
page_t &page_at (unsigned int i) { return pages[page_map[i].index]; }
|
||||
const page_t &page_at (unsigned int i) const { return pages[page_map[i].index]; }
|
||||
unsigned int get_major (hb_codepoint_t g) const { return g / page_t::PAGE_BITS; }
|
||||
hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
|
||||
};
|
||||
|
||||
struct hb_set_t : hb_sparseset_t<hb_bit_set_invertible_t> {};
|
||||
|
||||
static_assert (hb_set_t::INVALID == HB_SET_VALUE_INVALID, "");
|
||||
|
||||
|
||||
#endif /* HB_SET_HH */
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@ _hb_shape_plan_execute_internal (hb_shape_plan_t *shape_plan,
|
|||
|
||||
buffer->assert_unicode ();
|
||||
|
||||
if (unlikely (hb_object_is_inert (shape_plan)))
|
||||
if (unlikely (!hb_object_is_valid (shape_plan)))
|
||||
return false;
|
||||
|
||||
assert (shape_plan->face_unsafe == font->face);
|
||||
|
|
@ -529,7 +529,7 @@ hb_shape_plan_create_cached2 (hb_face_t *face,
|
|||
retry:
|
||||
hb_face_t::plan_node_t *cached_plan_nodes = face->shape_plans;
|
||||
|
||||
bool dont_cache = hb_object_is_inert (face);
|
||||
bool dont_cache = !hb_object_is_valid (face);
|
||||
|
||||
if (likely (!dont_cache))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ hb_base_sources = files(
|
|||
'hb-array.hh',
|
||||
'hb-atomic.hh',
|
||||
'hb-bimap.hh',
|
||||
'hb-bit-page.hh',
|
||||
'hb-blob.cc',
|
||||
'hb-blob.hh',
|
||||
'hb-buffer-serialize.cc',
|
||||
|
|
|
|||
|
|
@ -574,6 +574,486 @@ test_set_delrange (void)
|
|||
hb_set_destroy (s);
|
||||
}
|
||||
|
||||
static const unsigned max_set_elements = -1;
|
||||
|
||||
static void
|
||||
test_set_inverted_basics (void)
|
||||
{
|
||||
// Tests:
|
||||
// add, del, has, get_population, is_empty, get_min, get_max
|
||||
// for inverted sets.
|
||||
hb_set_t *s = hb_set_create ();
|
||||
hb_set_invert (s);
|
||||
|
||||
g_assert_cmpint (hb_set_get_population (s), ==, max_set_elements);
|
||||
g_assert (hb_set_has (s, 0));
|
||||
g_assert (hb_set_has (s, 13));
|
||||
g_assert (hb_set_has (s, max_set_elements - 1));
|
||||
g_assert (!hb_set_is_empty (s));
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 0);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 1);
|
||||
|
||||
hb_set_del (s, 13);
|
||||
g_assert (!hb_set_has (s, 13));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==, max_set_elements - 1);
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 0);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 1);
|
||||
|
||||
hb_set_add (s, 13);
|
||||
g_assert (hb_set_has (s, 13));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==, max_set_elements);
|
||||
|
||||
hb_set_del (s, 0);
|
||||
hb_set_del (s, max_set_elements - 1);
|
||||
g_assert (!hb_set_has (s, 0));
|
||||
g_assert (hb_set_has (s, 13));
|
||||
g_assert (!hb_set_has (s, max_set_elements - 1));
|
||||
g_assert (!hb_set_is_empty (s));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==, max_set_elements - 2);
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 1);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 2);
|
||||
|
||||
hb_set_destroy (s);
|
||||
}
|
||||
|
||||
static void
|
||||
test_set_inverted_ranges (void)
|
||||
{
|
||||
// Tests:
|
||||
// add_range, del_range, has, get_population, is_empty, get_min, get_max
|
||||
// for inverted sets.
|
||||
hb_set_t *s = hb_set_create ();
|
||||
hb_set_invert (s);
|
||||
|
||||
hb_set_del_range (s, 41, 4000);
|
||||
hb_set_add_range (s, 78, 601);
|
||||
|
||||
g_assert (hb_set_has (s, 40));
|
||||
g_assert (!hb_set_has (s, 41));
|
||||
g_assert (!hb_set_has (s, 64));
|
||||
g_assert (!hb_set_has (s, 77));
|
||||
g_assert (hb_set_has (s, 78));
|
||||
g_assert (hb_set_has (s, 300));
|
||||
g_assert (hb_set_has (s, 601));
|
||||
g_assert (!hb_set_has (s, 602));
|
||||
g_assert (!hb_set_has (s, 3000));
|
||||
g_assert (!hb_set_has (s, 4000));
|
||||
g_assert (hb_set_has (s, 4001));
|
||||
|
||||
g_assert (!hb_set_is_empty (s));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==, max_set_elements - 3436);
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 0);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 1);
|
||||
|
||||
hb_set_del_range (s, 0, 37);
|
||||
g_assert (!hb_set_has (s, 0));
|
||||
g_assert (!hb_set_has (s, 37));
|
||||
g_assert (hb_set_has (s, 38));
|
||||
g_assert (!hb_set_is_empty (s));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==,
|
||||
max_set_elements - 3436 - 38);
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 38);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 1);
|
||||
|
||||
hb_set_del_range (s, max_set_elements - 13, max_set_elements - 1);
|
||||
g_assert (!hb_set_has (s, max_set_elements - 1));
|
||||
g_assert (!hb_set_has (s, max_set_elements - 13));
|
||||
g_assert (hb_set_has (s, max_set_elements - 14));
|
||||
|
||||
g_assert (!hb_set_is_empty (s));
|
||||
g_assert_cmpint (hb_set_get_population (s), ==,
|
||||
max_set_elements - 3436 - 38 - 13);
|
||||
g_assert_cmpint (hb_set_get_min (s), ==, 38);
|
||||
g_assert_cmpint (hb_set_get_max (s), ==, max_set_elements - 14);
|
||||
|
||||
hb_set_destroy (s);
|
||||
}
|
||||
|
||||
static void
|
||||
test_set_inverted_iteration_next (void)
|
||||
{
|
||||
// Tests:
|
||||
// next, next_range
|
||||
hb_set_t *s = hb_set_create ();
|
||||
hb_set_invert (s);
|
||||
|
||||
hb_set_del_range (s, 41, 4000);
|
||||
hb_set_add_range (s, 78, 601);
|
||||
|
||||
hb_codepoint_t cp = HB_SET_VALUE_INVALID;
|
||||
hb_codepoint_t start = 0;
|
||||
hb_codepoint_t end = 0;
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 0);
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 1);
|
||||
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 1);
|
||||
g_assert_cmpint (end, ==, 40);
|
||||
|
||||
start = 40;
|
||||
end = 40;
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 78);
|
||||
g_assert_cmpint (end, ==, 601);
|
||||
|
||||
start = 40;
|
||||
end = 57;
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 78);
|
||||
g_assert_cmpint (end, ==, 601);
|
||||
|
||||
cp = 39;
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 40);
|
||||
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 78);
|
||||
|
||||
cp = 56;
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 78);
|
||||
|
||||
cp = 78;
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 79);
|
||||
|
||||
cp = 601;
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 4001);
|
||||
|
||||
cp = HB_SET_VALUE_INVALID;
|
||||
hb_set_del (s, 0);
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 1);
|
||||
|
||||
start = 0;
|
||||
end = 0;
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 1);
|
||||
g_assert_cmpint (end, ==, 40);
|
||||
|
||||
cp = max_set_elements - 1;
|
||||
g_assert (!hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
start = 4000;
|
||||
end = 4000;
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 4001);
|
||||
g_assert_cmpint (end, ==, max_set_elements - 1);
|
||||
|
||||
start = max_set_elements - 1;
|
||||
end = max_set_elements - 1;
|
||||
g_assert (!hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, HB_SET_VALUE_INVALID);
|
||||
g_assert_cmpint (end, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
cp = max_set_elements - 3;
|
||||
hb_set_del (s, max_set_elements - 1);
|
||||
g_assert (hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, max_set_elements - 2);
|
||||
g_assert (!hb_set_next (s, &cp));
|
||||
g_assert_cmpint (cp, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
|
||||
start = max_set_elements - 2;
|
||||
end = max_set_elements - 2;
|
||||
g_assert (!hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, HB_SET_VALUE_INVALID);
|
||||
g_assert_cmpint (end, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
start = max_set_elements - 3;
|
||||
end = max_set_elements - 3;
|
||||
g_assert (hb_set_next_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, max_set_elements - 2);
|
||||
g_assert_cmpint (end, ==, max_set_elements - 2);
|
||||
|
||||
hb_set_destroy (s);
|
||||
}
|
||||
|
||||
static void
|
||||
test_set_inverted_iteration_prev (void)
|
||||
{
|
||||
// Tests:
|
||||
// previous, previous_range
|
||||
hb_set_t *s = hb_set_create ();
|
||||
hb_set_invert (s);
|
||||
|
||||
hb_set_del_range (s, 41, 4000);
|
||||
hb_set_add_range (s, 78, 601);
|
||||
|
||||
hb_codepoint_t cp = HB_SET_VALUE_INVALID;
|
||||
hb_codepoint_t start = max_set_elements - 1;
|
||||
hb_codepoint_t end = max_set_elements - 1;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, max_set_elements - 1);
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, max_set_elements - 2);
|
||||
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 4001);
|
||||
g_assert_cmpint (end, ==, max_set_elements - 2);
|
||||
|
||||
start = 4001;
|
||||
end = 4001;
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 78);
|
||||
g_assert_cmpint (end, ==, 601);
|
||||
|
||||
start = 2500;
|
||||
end = 3000;
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 78);
|
||||
g_assert_cmpint (end, ==, 601);
|
||||
|
||||
cp = 4002;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 4001);
|
||||
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 601);
|
||||
|
||||
cp = 3500;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 601);
|
||||
|
||||
cp = 601;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 600);
|
||||
|
||||
cp = 78;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 40);
|
||||
|
||||
cp = HB_SET_VALUE_INVALID;
|
||||
hb_set_del (s, max_set_elements - 1);
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, max_set_elements - 2);
|
||||
|
||||
start = max_set_elements - 1;
|
||||
end = max_set_elements - 1;
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 4001);
|
||||
g_assert_cmpint (end, ==, max_set_elements - 2);
|
||||
|
||||
cp = 0;
|
||||
g_assert (!hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
cp = 40;
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 39);
|
||||
|
||||
start = 40;
|
||||
end = 40;
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 0);
|
||||
g_assert_cmpint (end, ==, 39);
|
||||
|
||||
start = 0;
|
||||
end = 0;
|
||||
g_assert (!hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, HB_SET_VALUE_INVALID);
|
||||
g_assert_cmpint (end, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
|
||||
cp = 2;
|
||||
hb_set_del (s, 0);
|
||||
g_assert (hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, 1);
|
||||
g_assert (!hb_set_previous (s, &cp));
|
||||
g_assert_cmpint (cp, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
start = 1;
|
||||
end = 1;
|
||||
g_assert (!hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, HB_SET_VALUE_INVALID);
|
||||
g_assert_cmpint (end, ==, HB_SET_VALUE_INVALID);
|
||||
|
||||
start = 2;
|
||||
end = 2;
|
||||
g_assert (hb_set_previous_range (s, &start, &end));
|
||||
g_assert_cmpint (start, ==, 1);
|
||||
g_assert_cmpint (end, ==, 1);
|
||||
|
||||
hb_set_destroy (s);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
test_set_inverted_equality (void)
|
||||
{
|
||||
hb_set_t *a = hb_set_create ();
|
||||
hb_set_t *b = hb_set_create ();
|
||||
hb_set_invert (a);
|
||||
hb_set_invert (b);
|
||||
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_add (a, 10);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (a, 42);
|
||||
g_assert (!hb_set_is_equal (a, b));
|
||||
g_assert (!hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (b, 42);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del_range (a, 43, 50);
|
||||
hb_set_del_range (a, 51, 76);
|
||||
hb_set_del_range (b, 43, 76);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (a, 0);
|
||||
g_assert (!hb_set_is_equal (a, b));
|
||||
g_assert (!hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (b, 0);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (a, max_set_elements - 1);
|
||||
g_assert (!hb_set_is_equal (a, b));
|
||||
g_assert (!hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_del (b, max_set_elements - 1);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_invert (a);
|
||||
g_assert (!hb_set_is_equal (a, b));
|
||||
g_assert (!hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_invert (b);
|
||||
g_assert (hb_set_is_equal (a, b));
|
||||
g_assert (hb_set_is_equal (b, a));
|
||||
|
||||
hb_set_destroy (a);
|
||||
hb_set_destroy (b);
|
||||
}
|
||||
|
||||
typedef enum {
|
||||
UNION = 0,
|
||||
INTERSECT,
|
||||
SUBTRACT,
|
||||
SYM_DIFF,
|
||||
LAST,
|
||||
} set_operation;
|
||||
|
||||
static hb_set_t* prepare_set(hb_bool_t has_x,
|
||||
hb_bool_t inverted,
|
||||
hb_bool_t has_page)
|
||||
{
|
||||
static const hb_codepoint_t x = 13;
|
||||
hb_set_t* s = hb_set_create ();
|
||||
if (inverted) hb_set_invert (s);
|
||||
if (has_page)
|
||||
{
|
||||
// Ensure a page exists for x.
|
||||
inverted ? hb_set_del (s, x) : hb_set_add (s, x);
|
||||
}
|
||||
if (has_x)
|
||||
hb_set_add (s, x);
|
||||
else
|
||||
hb_set_del (s, x);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
static hb_bool_t
|
||||
check_set_operations(hb_bool_t a_has_x,
|
||||
hb_bool_t a_inverted,
|
||||
hb_bool_t a_has_page,
|
||||
hb_bool_t b_has_x,
|
||||
hb_bool_t b_inverted,
|
||||
hb_bool_t b_has_page,
|
||||
set_operation op)
|
||||
{
|
||||
hb_codepoint_t x = 13;
|
||||
hb_set_t* a = prepare_set (a_has_x, a_inverted, a_has_page);
|
||||
hb_set_t* b = prepare_set (b_has_x, b_inverted, b_has_page);
|
||||
|
||||
char* op_name;
|
||||
hb_bool_t has_expected;
|
||||
hb_bool_t should_have_x;
|
||||
switch (op) {
|
||||
case UNION:
|
||||
default:
|
||||
op_name = "union";
|
||||
should_have_x = (a_has_x || b_has_x);
|
||||
hb_set_union (a, b);
|
||||
has_expected = (hb_set_has (a, x) == should_have_x);
|
||||
break;
|
||||
case INTERSECT:
|
||||
op_name = "intersect";
|
||||
should_have_x = (a_has_x && b_has_x);
|
||||
hb_set_intersect (a, b);
|
||||
has_expected = (hb_set_has (a, x) == should_have_x);
|
||||
break;
|
||||
case SUBTRACT:
|
||||
op_name = "subtract";
|
||||
should_have_x = (a_has_x && !b_has_x);
|
||||
hb_set_subtract (a, b);
|
||||
has_expected = (hb_set_has (a, x) == should_have_x);
|
||||
break;
|
||||
case SYM_DIFF:
|
||||
op_name = "sym_diff";
|
||||
should_have_x = (a_has_x ^ b_has_x);
|
||||
hb_set_symmetric_difference (a, b);
|
||||
has_expected = (hb_set_has (a, x) == should_have_x);
|
||||
break;
|
||||
}
|
||||
|
||||
printf ("%s%s%s %-9s %s%s%s == %s [%s]\n",
|
||||
a_inverted ? "i" : " ",
|
||||
a_has_page ? "p" : " ",
|
||||
a_has_x ? "{13}" : "{} ",
|
||||
op_name,
|
||||
b_inverted ? "i" : " ",
|
||||
b_has_page ? "p" : " ",
|
||||
b_has_x ? "{13}" : "{} ",
|
||||
should_have_x ? "{13}" : "{} ",
|
||||
has_expected ? "succeeded" : "failed");
|
||||
|
||||
hb_set_destroy (a);
|
||||
hb_set_destroy (b);
|
||||
|
||||
return has_expected;
|
||||
}
|
||||
|
||||
static void
|
||||
test_set_inverted_operations (void)
|
||||
{
|
||||
hb_bool_t all_succeeded = 1;
|
||||
for (hb_bool_t a_has_x = 0; a_has_x <= 1; a_has_x++) {
|
||||
for (hb_bool_t a_inverted = 0; a_inverted <= 1; a_inverted++) {
|
||||
for (hb_bool_t b_has_x = 0; b_has_x <= 1; b_has_x++) {
|
||||
for (hb_bool_t b_inverted = 0; b_inverted <= 1; b_inverted++) {
|
||||
for (hb_bool_t a_has_page = 0; a_has_page <= !(a_has_x ^ a_inverted); a_has_page++) {
|
||||
for (hb_bool_t b_has_page = 0; b_has_page <= !(b_has_x ^ b_inverted); b_has_page++) {
|
||||
for (set_operation op = UNION; op < LAST; op++) {
|
||||
all_succeeded = check_set_operations (a_has_x, a_inverted, a_has_page,
|
||||
b_has_x, b_inverted, b_has_page,
|
||||
op)
|
||||
&& all_succeeded;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g_assert (all_succeeded);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
|
|
@ -590,5 +1070,12 @@ main (int argc, char **argv)
|
|||
hb_test_add (test_set_intersect_page_reduction);
|
||||
hb_test_add (test_set_union);
|
||||
|
||||
hb_test_add (test_set_inverted_basics);
|
||||
hb_test_add (test_set_inverted_ranges);
|
||||
hb_test_add (test_set_inverted_iteration_next);
|
||||
hb_test_add (test_set_inverted_iteration_prev);
|
||||
hb_test_add (test_set_inverted_equality);
|
||||
hb_test_add (test_set_inverted_operations);
|
||||
|
||||
return hb_test_run();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,13 @@ struct subset_main_t : option_parser_t, face_options_t, output_options_t<false>
|
|||
g_option_context_set_ignore_unknown_options (parser.context, true);
|
||||
g_option_context_set_help_enabled (parser.context, false);
|
||||
|
||||
char **args = (char **) g_memdup (argv, argc * sizeof (*argv));
|
||||
char **args = (char **)
|
||||
#if GLIB_CHECK_VERSION (2, 68, 0)
|
||||
g_memdup2
|
||||
#else
|
||||
g_memdup
|
||||
#endif
|
||||
(argv, argc * sizeof (*argv));
|
||||
parser.parse (&argc, &args, true);
|
||||
g_free (args);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue