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

bin: release all subformulas between runs

Browse source 
Fixes #262, reported by Maximilien Colange.

* bin/common_output.cc, bin/common_aoutput.cc, bin/common_aoutput.hh:
Clear the set of atomic propositions if --stats=%[...]x was used.
* spot/twa/bdddict.cc: Release any formula associated to a BDD when it
is unregistered, do not wait for the dictionary's destruction.  This
was the main culprit for #262.
* tests/core/ltl2tgba.test: Add test cases.
* NEWS: Mention the bug.
This commit is contained in:
Alexandre Duret-Lutz 2017-05-18 16:46:11 +02:00
parent cdef3d69f0
commit acdaaac4f0
6 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spot/twa/bdddict.cc
View file

@ -235,7 +235,6 @@ namespace spot
// ME was the last user of this variable.
// Let's free it. First, we need to find
// if this is a Var or an Acc variable.
int n = 1;
formula f = nullptr;
switch (bdd_map[v].type)
{
@ -249,21 +248,19 @@ namespace spot
break;
case anon:
{
bdd_dict_priv::free_anonymous_list_of_type::iterator i;
// Nobody use this variable as an anonymous variable
// anymore, so remove it entirely from the anonymous
// free list so it can be used for something else.
for (i = priv_->free_anonymous_list_of.begin();
i != priv_->free_anonymous_list_of.end(); ++i)
i->second.remove(v, n);
for (auto& fal: priv_->free_anonymous_list_of)
fal.second.remove(v, 1);
break;
}
}
// Actually release the associated BDD variables, and the
// formula itself.
priv_->release_variables(v, n);
while (n--)
bdd_map[v + n].type = anon;
priv_->release_variables(v, 1);
bdd_map[v].type = anon;
bdd_map[v].f = nullptr;
}
void
@ -326,7 +323,6 @@ namespace spot
bdd_dict::assert_emptiness() const
{
bool fail = false;
bool var_seen = false;
bool acc_seen = false;
bool refs_seen = false;