This helps working around missing C functions like strcasecmp that do not exist everywhere (e.g. on Cygwin), and for which lib/ supplies a replacement. Unfortunately we do not have such build in our current continuous integration suite, so we cannot easily detect files where such config.h inclusion would be useful. Therefore this patch simply makes it mandatory to include config.h in *.cc files. Including this in public *.hh file is currently forbidden. * spot/gen/automata.cc, spot/gen/formulas.cc, spot/kripke/fairkripke.cc, spot/kripke/kripke.cc, spot/ltsmin/ltsmin.cc, spot/misc/game.cc, spot/parseaut/fmterror.cc, spot/parsetl/fmterror.cc, spot/parsetl/parsetl.yy, spot/priv/bddalloc.cc, spot/priv/freelist.cc, spot/priv/satcommon.cc, spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/ta.cc, spot/ta/taexplicit.cc, spot/ta/taproduct.cc, spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc, spot/taalgos/dot.cc, spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc, spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc, spot/taalgos/stats.cc, spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc, spot/tl/declenv.cc, spot/tl/defaultenv.cc, spot/tl/dot.cc, spot/tl/exclusive.cc, spot/tl/hierarchy.cc, spot/tl/length.cc, spot/tl/ltlf.cc, spot/tl/mark.cc, spot/tl/mutation.cc, spot/tl/nenoform.cc, spot/tl/print.cc, spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc, spot/tl/simplify.cc, spot/tl/snf.cc, spot/tl/unabbrev.cc, spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/bddprint.cc, spot/twa/formula2bdd.cc, spot/twa/taatgba.cc, spot/twa/twa.cc, spot/twa/twagraph.cc, spot/twa/twaproduct.cc, spot/twaalgos/aiger.cc, spot/twaalgos/alternation.cc, spot/twaalgos/are_isomorphic.cc, spot/twaalgos/bfssteps.cc, spot/twaalgos/canonicalize.cc, spot/twaalgos/cleanacc.cc, spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc, spot/twaalgos/complete.cc, spot/twaalgos/compsusp.cc, spot/twaalgos/couvreurnew.cc, spot/twaalgos/cycles.cc, spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc, spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc, spot/twaalgos/dualize.cc, spot/twaalgos/emptiness.cc, spot/twaalgos/gtec/ce.cc, spot/twaalgos/gtec/gtec.cc, spot/twaalgos/gtec/sccstack.cc, spot/twaalgos/gtec/status.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc, spot/twaalgos/iscolored.cc, spot/twaalgos/isdet.cc, spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc, spot/twaalgos/langmap.cc, spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2taa.cc, spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/magic.cc, spot/twaalgos/mask.cc, spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc, spot/twaalgos/parity.cc, spot/twaalgos/postproc.cc, spot/twaalgos/powerset.cc, spot/twaalgos/product.cc, spot/twaalgos/rabin2parity.cc, spot/twaalgos/randomgraph.cc, spot/twaalgos/randomize.cc, spot/twaalgos/reachiter.cc, spot/twaalgos/relabel.cc, spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc, spot/twaalgos/sbacc.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc, spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc, spot/twaalgos/split.cc, spot/twaalgos/stats.cc, spot/twaalgos/strength.cc, spot/twaalgos/stripacc.cc, spot/twaalgos/stutter.cc, spot/twaalgos/sum.cc, spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc, spot/twaalgos/totgba.cc, spot/twaalgos/toweak.cc, spot/twaalgos/translate.cc, spot/twaalgos/word.cc, tests/core/acc.cc, tests/core/bitvect.cc, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/graph.cc, tests/core/ikwiad.cc, tests/core/intvcmp2.cc, tests/core/intvcomp.cc, tests/core/kind.cc, tests/core/kripkecat.cc, tests/core/length.cc, tests/core/ltlrel.cc, tests/core/ngraph.cc, tests/core/parity.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/sccif.cc, tests/core/syntimpl.cc, tests/core/taatgba.cc, tests/core/tostring.cc, tests/core/trival.cc, tests/core/twagraph.cc, tests/ltsmin/modelcheck.cc, spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include config.h. * spot/gen/Makefile.am, spot/graph/Makefile.am, spot/kripke/Makefile.am, spot/ltsmin/Makefile.am, spot/parseaut/Makefile.am, spot/parsetl/Makefile.am, spot/priv/Makefile.am, spot/ta/Makefile.am, spot/taalgos/Makefile.am, spot/tl/Makefile.am, spot/twa/Makefile.am, spot/twaalgos/Makefile.am, spot/twaalgos/gtec/Makefile.am, tests/Makefile.am: Add the -I lib/ flags. * tests/sanity/includes.test: Catch missing config.h in *.cc, and diagnose config.h in *.hh. * tests/sanity/style.test: Better diagnostics.
303 lines
7.2 KiB
C++
303 lines
7.2 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 2011, 2013-2016, 2018 Laboratoire de Recherche
|
|
// et Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
|
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
|
// et Marie Curie.
|
|
//
|
|
// This file is part of Spot, a model checking library.
|
|
//
|
|
// Spot is free software; you can redistribute it and/or modify it
|
|
// under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation; either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
|
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
// License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#include "config.h"
|
|
#include <cassert>
|
|
#include <spot/twaalgos/reachiter.hh>
|
|
|
|
namespace spot
|
|
{
|
|
// twa_reachable_iterator
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
twa_reachable_iterator::twa_reachable_iterator(const const_twa_ptr& a)
|
|
: aut_(a)
|
|
{
|
|
}
|
|
|
|
twa_reachable_iterator::~twa_reachable_iterator()
|
|
{
|
|
auto s = seen.begin();
|
|
while (s != seen.end())
|
|
{
|
|
// Advance the iterator before deleting the "key" pointer.
|
|
const state* ptr = s->first;
|
|
++s;
|
|
ptr->destroy();
|
|
}
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator::run()
|
|
{
|
|
int n = 0;
|
|
start();
|
|
const state* i = aut_->get_init_state();
|
|
if (want_state(i))
|
|
add_state(i);
|
|
seen[i] = ++n;
|
|
const state* t;
|
|
while ((t = next_state()))
|
|
{
|
|
assert(seen.find(t) != seen.end());
|
|
int tn = seen[t];
|
|
twa_succ_iterator* si = aut_->succ_iter(t);
|
|
process_state(t, tn, si);
|
|
if (si->first())
|
|
do
|
|
{
|
|
const state* current = si->dst();
|
|
auto s = seen.find(current);
|
|
bool ws = want_state(current);
|
|
if (s == seen.end())
|
|
{
|
|
seen[current] = ++n;
|
|
if (ws)
|
|
{
|
|
add_state(current);
|
|
process_link(t, tn, current, n, si);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (ws)
|
|
process_link(t, tn, s->first, s->second, si);
|
|
current->destroy();
|
|
}
|
|
}
|
|
while (si->next());
|
|
aut_->release_iter(si);
|
|
}
|
|
end();
|
|
}
|
|
|
|
bool
|
|
twa_reachable_iterator::want_state(const state*) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator::start()
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator::end()
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator::process_state(const state*, int,
|
|
twa_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator::process_link(const state*, int,
|
|
const state*, int,
|
|
const twa_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
// twa_reachable_iterator_breadth_first
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
twa_reachable_iterator_breadth_first::
|
|
twa_reachable_iterator_breadth_first(const const_twa_ptr& a)
|
|
: twa_reachable_iterator(a)
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_breadth_first::add_state(const state* s)
|
|
{
|
|
todo.emplace_back(s);
|
|
}
|
|
|
|
const state*
|
|
twa_reachable_iterator_breadth_first::next_state()
|
|
{
|
|
if (todo.empty())
|
|
return nullptr;
|
|
const state* s = todo.front();
|
|
todo.pop_front();
|
|
return s;
|
|
}
|
|
|
|
// twa_reachable_iterator_depth_first
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
twa_reachable_iterator_depth_first::
|
|
twa_reachable_iterator_depth_first(const const_twa_ptr& a)
|
|
: aut_(a)
|
|
{
|
|
}
|
|
|
|
twa_reachable_iterator_depth_first::~twa_reachable_iterator_depth_first()
|
|
{
|
|
auto s = seen.begin();
|
|
while (s != seen.end())
|
|
{
|
|
// Advance the iterator before deleting the "key" pointer.
|
|
const state* ptr = s->first;
|
|
++s;
|
|
ptr->destroy();
|
|
}
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::push(const state* s, int sn)
|
|
{
|
|
twa_succ_iterator* si = aut_->succ_iter(s);
|
|
process_state(s, sn, si);
|
|
stack_item item = { s, sn, si };
|
|
todo.emplace_back(item);
|
|
si->first();
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::pop()
|
|
{
|
|
aut_->release_iter(todo.back().it);
|
|
todo.pop_back();
|
|
if (!todo.empty())
|
|
todo.back().it->next();
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::run()
|
|
{
|
|
int n = 1;
|
|
start();
|
|
const state* i = aut_->get_init_state();
|
|
if (want_state(i))
|
|
push(i, n);
|
|
seen[i] = n++;
|
|
const state* dst;
|
|
while (!todo.empty())
|
|
{
|
|
twa_succ_iterator* si = todo.back().it;
|
|
if (si->done())
|
|
{
|
|
pop();
|
|
continue;
|
|
}
|
|
|
|
dst = si->dst();
|
|
auto res = seen.emplace(dst, n);
|
|
if (!res.second)
|
|
{
|
|
// The state has already been seen.
|
|
dst->destroy();
|
|
// 0-numbered states are not wanted.
|
|
if (res.first->second == 0)
|
|
{
|
|
si->next();
|
|
continue;
|
|
}
|
|
dst = res.first->first;
|
|
}
|
|
else if (!want_state(dst))
|
|
{
|
|
// Mark this state as non-wanted in case we see it again.
|
|
res.first->second = 0;
|
|
si->next();
|
|
continue;
|
|
}
|
|
else
|
|
{
|
|
++n;
|
|
}
|
|
|
|
int dst_n = res.first->second;
|
|
process_link(todo.back().src, todo.back().src_n, dst, dst_n, si);
|
|
|
|
if (res.second)
|
|
push(dst, dst_n);
|
|
else
|
|
si->next();
|
|
}
|
|
end();
|
|
}
|
|
|
|
bool
|
|
twa_reachable_iterator_depth_first::want_state(const state*) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::start()
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::end()
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::process_state(const state*, int,
|
|
twa_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first::process_link(const state*, int,
|
|
const state*, int,
|
|
const twa_succ_iterator*)
|
|
{
|
|
}
|
|
|
|
// twa_reachable_iterator_depth_first_stack
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
twa_reachable_iterator_depth_first_stack::
|
|
twa_reachable_iterator_depth_first_stack(const const_twa_ptr& a)
|
|
: twa_reachable_iterator_depth_first(a)
|
|
{
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first_stack::push(const state* s, int sn)
|
|
{
|
|
stack_.insert(sn);
|
|
this->twa_reachable_iterator_depth_first::push(s, sn);
|
|
}
|
|
|
|
void
|
|
twa_reachable_iterator_depth_first_stack::pop()
|
|
{
|
|
stack_.erase(todo.back().src_n);
|
|
this->twa_reachable_iterator_depth_first::pop();
|
|
}
|
|
|
|
bool
|
|
twa_reachable_iterator_depth_first_stack::on_stack(int sn) const
|
|
{
|
|
return stack_.find(sn) != stack_.end();
|
|
}
|
|
|
|
|
|
}
|