alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acc: turn some assertions into exceptions

Browse source 
* spot/misc/bitset.cc, spot/misc/bitset.hh (set, clear):
Turn asserts into exceptions.
* spot/twa/acc.hh (mark_t): As a consequence, the
constructor is not noexcept anymore.
* tests/core/acc.cc, tests/python/except.py: More tests.
This commit is contained in:
Alexandre Duret-Lutz 2018-05-26 09:44:18 +02:00
parent be0997c97a
commit 6d9d35c985
5 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
spot/misc/bitset.hh
View file

@ -29,11 +29,12 @@ namespace spot
namespace internal
{
[[noreturn]] SPOT_API void report_bit_shift_too_big();
[[noreturn]] SPOT_API void report_bit_out_of_bounds();
}
#endif
template<size_t N>
class bitset
class SPOT_API bitset
{
using word_t = unsigned;
// the number of bits must hold on an unsigned
@ -126,13 +127,23 @@ namespace spot
void set(unsigned s)
{
SPOT_ASSERT(s < 8*N*sizeof(word_t));
#if SPOT_DEBUG || defined(SWIGPYTHON)
if (SPOT_UNLIKELY(s >= 8 * N * sizeof(word_t)))
internal::report_bit_out_of_bounds();
#else
SPOT_ASSUME(s < 8 * N * sizeof(word_t));
#endif
data[s / (8*sizeof(word_t))] |= 1U << (s % (8*sizeof(word_t)));
}
void clear(unsigned s)
{
SPOT_ASSERT(s < 8*N*sizeof(word_t));
#if SPOT_DEBUG || defined(SWIGPYTHON)
if (SPOT_UNLIKELY(s >= 8 * N * sizeof(word_t)))
internal::report_bit_out_of_bounds();
#else
SPOT_ASSUME(s < 8 * N * sizeof(word_t));
#endif
data[s / (8*sizeof(word_t))] &= ~(1U << (s % (8*sizeof(word_t))));
}