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

adjust to Swig 4.1.0

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

2
tests/python/_synthesis.ipynb
View file

@ -6346,7 +6346,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7fbccc33adb0> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7fbccc33adb0> >"
]
},
"execution_count": 28,

5
tests/python/ipnbdoctest.py
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.

12
tests/python/synthesis.ipynb
View file

@ -2601,7 +2601,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e584deae0> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e584deae0> >"
]
},
"metadata": {},
@ -3256,7 +3256,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e5855c9f0> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e5855c9f0> >"
]
},
"metadata": {},
@ -3385,7 +3385,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e5855c900> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e5855c900> >"
]
},
"metadata": {},
@ -3801,7 +3801,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e584def00> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e584def00> >"
]
},
"metadata": {},
@ -3979,7 +3979,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e5855c930> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e5855c930> >"
]
},
"metadata": {},
@ -4159,7 +4159,7 @@
"</svg>\n"
],
"text/plain": [
"<spot.aig; proxy of <Swig Object of type 'spot::aig_ptr *' at 0x7f0e584def90> >"
"<spot.aig; proxy of <Swig Object of type 'std::shared_ptr< spot::aig > *' at 0x7f0e584def90> >"
]
},
"metadata": {},