adjust to Swig 4.1.0

* python/spot/__init__.py: Add flatnested versions of some static
methods.
* spot/twa/acc.hh: Hide && version of & and |, causing trouble
to swig.
* tests/python/_synthesis.ipynb, tests/python/synthesis.ipynb:
Upgrade expected type names.
* tests/python/ipnbdoctest.py: Adjust for difference between 4.0 and
4.1.
This commit is contained in:
Alexandre Duret-Lutz 2022-11-07 16:24:33 +01:00
parent 6dc740184c
commit b36cee06a1
5 changed files with 27 additions and 15 deletions

View file

@ -101,6 +101,11 @@ def canonicalize(s, type, ignores):
# %%file writes `Writing`, or `Overwriting` if the file exists.
s = re.sub(r'^Overwriting ', 'Writing ', s)
# Swig 4.1.0 fixed an ordering issue with how types are printed.
# aig_ptr is expected to be printed as shared_ptr<aig>, but prior
# Swig version did not do that.
s = re.sub(r'spot::aig_ptr ', 'std::shared_ptr< spot::aig > ', s)
# SVG generated by graphviz may put note at different positions
# depending on the graphviz build. Let's just strip anything that
# look like a position.