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

rename SPOT_NB_ACC to SPOT_MAX_ACCSETS

Browse source 
* NEWS, bin/autcross.cc, bin/autfilt.cc, bin/ltlcross.cc,
configure.ac, spot/parseaut/parseaut.yy, spot/twa/acc.cc,
spot/twa/acc.hh, tests/core/acc.cc, .gitlab-ci.yml: Here.
This commit is contained in:
Alexandre Duret-Lutz 2018-05-24 17:52:42 +02:00
parent cc2c4615d0
commit 2e165f188d
10 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spot/parseaut/parseaut.yy
View file

@ -772,7 +772,7 @@ header-item: "States:" INT
"acceptance condition...");
error(res.accset_loc, "... previously defined here.");
}
else if ($2 > SPOT_NB_ACC)
else if ($2 > SPOT_MAX_ACCSETS)
{
error(@1 + @2,
"this implementation cannot support such a large "

2
spot/twa/acc.cc
View file

@ -37,7 +37,7 @@ namespace spot
#define STR(x) #x
#define VALUESTR(x) STR(x)
throw std::runtime_error("Too many acceptance sets used. "
"The limit is " VALUESTR(SPOT_NB_ACC) ".");
"The limit is " VALUESTR(SPOT_MAX_ACCSETS) ".");
}
std::ostream& operator<<(std::ostream& os, spot::acc_cond::mark_t m)

15
spot/twa/acc.hh
View file

@ -52,11 +52,12 @@ namespace spot
[[noreturn]] static void report_too_many_sets();
#endif
public:
struct mark_t : public internal::_32acc<SPOT_NB_ACC == 8*sizeof(unsigned)>
struct mark_t :
public internal::_32acc<SPOT_MAX_ACCSETS == 8*sizeof(unsigned)>
{
private:
// configure guarantees that SPOT_NB_ACC % (8*sizeof(unsigned)) == 0
typedef bitset<SPOT_NB_ACC / (8*sizeof(unsigned))> _value_t;
// configure guarantees that SPOT_MAX_ACCSETS % (8*sizeof(unsigned)) == 0
typedef bitset<SPOT_MAX_ACCSETS / (8*sizeof(unsigned))> _value_t;
_value_t id;
mark_t(_value_t id) noexcept
@ -564,7 +565,7 @@ namespace spot
if (n == 0)
return inf({});
acc_cond::mark_t m = mark_t::all();
m >>= (SPOT_NB_ACC - n);
m >>= (SPOT_MAX_ACCSETS - n);
return inf(m);
}
@ -573,7 +574,7 @@ namespace spot
if (n == 0)
return fin({});
acc_cond::mark_t m = mark_t::all();
m >>= (SPOT_NB_ACC - n);
m >>= (SPOT_MAX_ACCSETS - n);
return fin(m);
}
@ -1245,7 +1246,7 @@ namespace spot
return -1U;
unsigned j = num_;
num_ += num;
if (num_ > SPOT_NB_ACC)
if (num_ > SPOT_MAX_ACCSETS)
report_too_many_sets();
all_ = all_sets_();
return j;
@ -1383,7 +1384,7 @@ namespace spot
protected:
mark_t all_sets_() const
{
return mark_t::all() >> (SPOT_NB_ACC - num_);
return mark_t::all() >> (SPOT_MAX_ACCSETS - num_);
}
unsigned num_;