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

work around some Swig 4.2 change

Browse source 
Several test cases started failing after updating to Swig 4.2 because
the spot.ltsmin module and the spot.impl module were using different
names for atomic_prop_set.  This seems to work around it.

* python/spot/impl.i: Specify the full type for atomic_prop_set.
This commit is contained in:
Alexandre Duret-Lutz 2024-02-06 17:28:48 +01:00
parent 342360f8ca
commit 94ab42612a
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python/spot/impl.i
View file

@ -529,7 +529,13 @@ namespace std {
%template(vectorstring) vector<string>; %template(vectorstring) vector<string>;
%template(vectorint) vector<int>; %template(vectorint) vector<int>;
%template(pair_formula_vectorstring) pair<spot::formula, vector<string>>; %template(pair_formula_vectorstring) pair<spot::formula, vector<string>>;
%template(atomic_prop_set) set<spot::formula>; // We specify the optional std::less/std::allocator arguments of set
// to work around an issue that appeared with Swig 4.2. Without those
// arguments the type of set<spot::formula> used in module ltlsmin.i
// does not match the type of set<spot::formula> used here!
%template(atomic_prop_set) set<spot::formula,
std::less<spot::formula>,
std::allocator<spot::formula>>;
%template(vectorofvectorofformulas) vector<vector<spot::formula>>; %template(vectorofvectorofformulas) vector<vector<spot::formula>>;
%template(setunsigned) set<unsigned>; %template(setunsigned) set<unsigned>;
%template(relabeling_map) map<spot::formula, spot::formula>; %template(relabeling_map) map<spot::formula, spot::formula>;
@ -813,7 +819,9 @@ def state_is_accepting(self, src) -> "bool":
%include <spot/taalgos/stats.hh> %include <spot/taalgos/stats.hh>
%include <spot/taalgos/minimize.hh> %include <spot/taalgos/minimize.hh>
%extend std::set<spot::formula> { %extend std::set<spot::formula,
std::less<spot::formula>,
std::allocator<spot::formula>> {
std::string __str__() std::string __str__()
{ {
std::ostringstream os; std::ostringstream os;