Commit 8520c4c3 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

rename tgba_ptr into twa_ptr

Automatic mass renaming.

* iface/ltsmin/modelcheck.cc, src/dstarparse/dra2ba.cc,
src/dstarparse/nra2nba.cc, src/ltlvisit/apcollect.cc,
src/ltlvisit/apcollect.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh,
src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.hh,
src/taalgos/tgba2ta.cc, src/taalgos/tgba2ta.hh, src/tgba/fwd.hh,
src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbagraph.hh,
src/tgba/tgbamask.cc, src/tgba/tgbamask.hh, src/tgba/tgbaproduct.cc,
src/tgba/tgbaproduct.hh, src/tgba/tgbaproxy.cc, src/tgba/tgbaproxy.hh,
src/tgbaalgos/bfssteps.cc, src/tgbaalgos/bfssteps.hh,
src/tgbaalgos/complete.cc, src/tgbaalgos/complete.hh,
src/tgbaalgos/compsusp.cc, src/tgbaalgos/dotty.cc,
src/tgbaalgos/dotty.hh, src/tgbaalgos/dtgbasat.cc,
src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh,
src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh,
src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh,
src/tgbaalgos/gtec/status.cc, src/tgbaalgos/gtec/status.hh,
src/tgbaalgos/gv04.cc, src/tgbaalgos/gv04.hh, src/tgbaalgos/hoa.cc,
src/tgbaalgos/hoa.hh, src/tgbaalgos/lbtt.cc, src/tgbaalgos/lbtt.hh,
src/tgbaalgos/magic.cc, src/tgbaalgos/magic.hh,
src/tgbaalgos/minimize.cc, src/tgbaalgos/ndfs_result.hxx,
src/tgbaalgos/neverclaim.cc, src/tgbaalgos/neverclaim.hh,
src/tgbaalgos/projrun.cc, src/tgbaalgos/projrun.hh,
src/tgbaalgos/reachiter.cc, src/tgbaalgos/reachiter.hh,
src/tgbaalgos/reducerun.cc, src/tgbaalgos/reducerun.hh,
src/tgbaalgos/replayrun.cc, src/tgbaalgos/replayrun.hh,
src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/se05.cc,
src/tgbaalgos/se05.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stats.hh,
src/tgbaalgos/stutter.cc, src/tgbaalgos/tau03.cc,
src/tgbaalgos/tau03.hh, src/tgbaalgos/tau03opt.cc,
src/tgbaalgos/tau03opt.hh, src/tgbatest/checkta.cc,
src/tgbatest/complementation.cc, src/tgbatest/emptchk.cc,
src/tgbatest/ltl2tgba.cc, wrap/python/spot_impl.i: Rename tgba_ptr as
twa_ptr.
parent 5d977847
......@@ -21,7 +21,7 @@
namespace spot
{
tgba_proxy::tgba_proxy(const const_tgba_ptr& original)
tgba_proxy::tgba_proxy(const const_twa_ptr& original)
: twa(original->get_dict()), original_(original)
{
get_dict()->register_all_variables_of(original, this);
......@@ -62,7 +62,7 @@ namespace spot
}
state*
tgba_proxy::project_state(const state* s, const const_tgba_ptr& t) const
tgba_proxy::project_state(const state* s, const const_twa_ptr& t) const
{
return original_->project_state(s, t);
}
......
......@@ -35,7 +35,7 @@ namespace spot
class SPOT_API tgba_proxy: public twa
{
protected:
tgba_proxy(const const_tgba_ptr& original);
tgba_proxy(const const_twa_ptr& original);
public:
virtual ~tgba_proxy();
......@@ -50,10 +50,10 @@ namespace spot
virtual std::string
transition_annotation(const twa_succ_iterator* t) const;
virtual state* project_state(const state* s, const const_tgba_ptr& t) const;
virtual state* project_state(const state* s, const const_twa_ptr& t) const;
protected:
virtual bdd compute_support_conditions(const state* state) const;
const_tgba_ptr original_;
const_twa_ptr original_;
};
}
......@@ -28,7 +28,7 @@
namespace spot
{
bfs_steps::bfs_steps(const const_tgba_ptr& a)
bfs_steps::bfs_steps(const const_twa_ptr& a)
: a_(a)
{
}
......
......@@ -40,7 +40,7 @@ namespace spot
class SPOT_API bfs_steps
{
public:
bfs_steps(const const_tgba_ptr& a);
bfs_steps(const const_twa_ptr& a);
virtual ~bfs_steps();
/// \brief Start the search from \a start, and append the
......@@ -97,6 +97,6 @@ namespace spot
tgba_run::steps& l);
protected:
const_tgba_ptr a_; ///< The spot::tgba we are searching into.
const_twa_ptr a_; ///< The spot::tgba we are searching into.
};
}
......@@ -117,7 +117,7 @@ namespace spot
return sink;
}
twa_graph_ptr tgba_complete(const const_tgba_ptr& aut)
twa_graph_ptr tgba_complete(const const_twa_ptr& aut)
{
auto res = make_twa_graph(aut, {
true, // state based
......
......@@ -35,5 +35,5 @@ namespace spot
/// \brief Clone a tgba and complete it.
///
/// If the tgba has no acceptance set, one will be added.
SPOT_API twa_graph_ptr tgba_complete(const const_tgba_ptr& aut);
SPOT_API twa_graph_ptr tgba_complete(const const_twa_ptr& aut);
}
......@@ -212,7 +212,7 @@ namespace spot
static
twa_graph_ptr
susp_prod(const const_tgba_ptr& left, const ltl::formula* f, bdd v)
susp_prod(const const_twa_ptr& left, const ltl::formula* f, bdd v)
{
bdd_dict_ptr dict = left->get_dict();
auto right =
......
......@@ -488,7 +488,7 @@ namespace spot
} // anonymous namespace
std::ostream&
dotty_reachable(std::ostream& os, const const_tgba_ptr& g,
dotty_reachable(std::ostream& os, const const_twa_ptr& g,
const char* options)
{
dotty_output d(os, options);
......
......@@ -42,6 +42,6 @@ namespace spot
/// 'a' shows the acceptance.
SPOT_API std::ostream&
dotty_reachable(std::ostream& os,
const const_tgba_ptr& g,
const const_twa_ptr& g,
const char* options = nullptr);
}
......@@ -245,12 +245,12 @@ namespace spot
struct dict
{
dict(const const_tgba_ptr& a)
dict(const const_twa_ptr& a)
: aut(a)
{
}
const_tgba_ptr aut;
const_twa_ptr aut;
typedef std::map<transition, int> trans_map;
typedef std::map<transition_acc, int> trans_acc_map;
trans_map transid;
......
......@@ -36,7 +36,7 @@ namespace spot
class dupexp_iter: public T
{
public:
dupexp_iter(const const_tgba_ptr& a, twa::prop_set p)
dupexp_iter(const const_twa_ptr& a, twa::prop_set p)
: T(a), out_(make_twa_graph(a->get_dict()))
{
out_->copy_acceptance_of(a);
......@@ -76,7 +76,7 @@ namespace spot
} // anonymous
twa_graph_ptr
tgba_dupexp_bfs(const const_tgba_ptr& aut, twa::prop_set p)
tgba_dupexp_bfs(const const_twa_ptr& aut, twa::prop_set p)
{
dupexp_iter<tgba_reachable_iterator_breadth_first> di(aut, p);
di.run();
......@@ -84,7 +84,7 @@ namespace spot
}
twa_graph_ptr
tgba_dupexp_dfs(const const_tgba_ptr& aut, twa::prop_set p)
tgba_dupexp_dfs(const const_twa_ptr& aut, twa::prop_set p)
{
dupexp_iter<tgba_reachable_iterator_depth_first> di(aut, p);
di.run();
......
......@@ -33,10 +33,10 @@ namespace spot
/// \brief Build an explicit automaton from all states of \a aut,
/// numbering states in bread first order as they are processed.
SPOT_API twa_graph_ptr
tgba_dupexp_bfs(const const_tgba_ptr& aut, twa::prop_set p);
tgba_dupexp_bfs(const const_twa_ptr& aut, twa::prop_set p);
/// \ingroup tgba_misc
/// \brief Build an explicit automaton from all states of \a aut,
/// numbering states in depth first order as they are processed.
SPOT_API twa_graph_ptr
tgba_dupexp_dfs(const const_tgba_ptr& aut, twa::prop_set p);
tgba_dupexp_dfs(const const_twa_ptr& aut, twa::prop_set p);
}
......@@ -77,7 +77,7 @@ namespace spot
std::ostream&
print_tgba_run(std::ostream& os,
const const_tgba_ptr& a,
const const_twa_ptr& a,
const const_tgba_run_ptr& run)
{
bdd_dict_ptr d = a->get_dict();
......@@ -189,7 +189,7 @@ namespace spot
struct ec_algo
{
const char* name;
emptiness_check_ptr(*construct)(const const_tgba_ptr&,
emptiness_check_ptr(*construct)(const const_twa_ptr&,
spot::option_map);
unsigned int min_acc;
unsigned int max_acc;
......@@ -225,7 +225,7 @@ namespace spot
}
emptiness_check_ptr
emptiness_check_instantiator::instantiate(const const_tgba_ptr& a) const
emptiness_check_instantiator::instantiate(const const_twa_ptr& a) const
{
return static_cast<ec_algo*>(info_)->construct(a, o_);
}
......@@ -291,7 +291,7 @@ namespace spot
//////////////////////////////////////////////////////////////////////
twa_graph_ptr
tgba_run_to_tgba(const const_tgba_ptr& a, const const_tgba_run_ptr& run)
tgba_run_to_tgba(const const_twa_ptr& a, const const_tgba_run_ptr& run)
{
auto d = a->get_dict();
auto res = make_twa_graph(d);
......
......@@ -77,7 +77,7 @@ namespace spot
class SPOT_API emptiness_check_result
{
public:
emptiness_check_result(const const_tgba_ptr& a,
emptiness_check_result(const const_twa_ptr& a,
option_map o = option_map())
: a_(a), o_(o)
{
......@@ -103,7 +103,7 @@ namespace spot
virtual tgba_run_ptr accepting_run();
/// The automaton on which an accepting_run() was found.
const const_tgba_ptr&
const const_twa_ptr&
automaton() const
{
return a_;
......@@ -126,7 +126,7 @@ namespace spot
/// Notify option updates.
virtual void options_updated(const option_map& old);
const_tgba_ptr a_; ///< The automaton.
const_twa_ptr a_; ///< The automaton.
option_map o_; ///< The options.
};
......@@ -137,14 +137,14 @@ namespace spot
public std::enable_shared_from_this<emptiness_check>
{
public:
emptiness_check(const const_tgba_ptr& a, option_map o = option_map())
emptiness_check(const const_twa_ptr& a, option_map o = option_map())
: a_(a), o_(o)
{
}
virtual ~emptiness_check();
/// The automaton that this emptiness-check inspects.
const const_tgba_ptr&
const const_twa_ptr&
automaton() const
{
return a_;
......@@ -192,7 +192,7 @@ namespace spot
virtual void options_updated(const option_map& old);
protected:
const_tgba_ptr a_; ///< The automaton.
const_twa_ptr a_; ///< The automaton.
option_map o_; ///< The options
};
......@@ -207,7 +207,7 @@ namespace spot
{
public:
/// Actually instantiate the emptiness check, for \a a.
emptiness_check_ptr instantiate(const const_tgba_ptr& a) const;
emptiness_check_ptr instantiate(const const_twa_ptr& a) const;
/// Accessor to the options.
/// @{
......@@ -308,7 +308,7 @@ namespace spot
/// transition annotation).
SPOT_API std::ostream&
print_tgba_run(std::ostream& os,
const const_tgba_ptr& a,
const const_twa_ptr& a,
const const_tgba_run_ptr& run);
/// \brief Return an explicit_tgba corresponding to \a run (i.e. comparable
......@@ -316,7 +316,7 @@ namespace spot
///
/// \pre \a run must correspond to an actual run of the automaton \a a.
SPOT_API twa_graph_ptr
tgba_run_to_tgba(const const_tgba_ptr& a, const const_tgba_run_ptr& run);
tgba_run_to_tgba(const const_twa_ptr& a, const const_tgba_run_ptr& run);
/// @}
......
......@@ -40,7 +40,7 @@ namespace spot
typedef std::pair<const spot::state*, twa_succ_iterator*> pair_state_iter;
}
couvreur99_check::couvreur99_check(const const_tgba_ptr& a, option_map o)
couvreur99_check::couvreur99_check(const const_twa_ptr& a, option_map o)
: emptiness_check(a, o),
removed_components(0)
{
......@@ -326,7 +326,7 @@ namespace spot
}
}
couvreur99_check_shy::couvreur99_check_shy(const const_tgba_ptr& a,
couvreur99_check_shy::couvreur99_check_shy(const const_twa_ptr& a,
option_map o)
: couvreur99_check(a, o), num(1)
{
......@@ -607,7 +607,7 @@ namespace spot
}
emptiness_check_ptr
couvreur99(const const_tgba_ptr& a, option_map o)
couvreur99(const const_twa_ptr& a, option_map o)
{
if (o.get("shy"))
return std::make_shared<couvreur99_check_shy>(a, o);
......
......@@ -136,7 +136,7 @@ namespace spot
/// choosing a successor. Otherwise, only the successor of the
/// topmost state on the DFS stack are considered.
SPOT_API emptiness_check_ptr
couvreur99(const const_tgba_ptr& a, option_map options = option_map());
couvreur99(const const_twa_ptr& a, option_map options = option_map());
#ifndef SWIG
/// \brief An implementation of the Couvreur99 emptiness-check algorithm.
......@@ -145,7 +145,7 @@ namespace spot
class SPOT_API couvreur99_check: public emptiness_check, public ec_statistics
{
public:
couvreur99_check(const const_tgba_ptr& a, option_map o = option_map());
couvreur99_check(const const_twa_ptr& a, option_map o = option_map());
virtual ~couvreur99_check();
/// Check whether the automaton's language is empty.
......@@ -187,7 +187,7 @@ namespace spot
class SPOT_API couvreur99_check_shy final: public couvreur99_check
{
public:
couvreur99_check_shy(const const_tgba_ptr& a, option_map o = option_map());
couvreur99_check_shy(const const_twa_ptr& a, option_map o = option_map());
virtual ~couvreur99_check_shy();
virtual emptiness_check_result_ptr check();
......
......@@ -25,7 +25,7 @@
namespace spot
{
couvreur99_check_status::couvreur99_check_status(const const_tgba_ptr& aut)
couvreur99_check_status::couvreur99_check_status(const const_twa_ptr& aut)
: aut(aut)
{
}
......
......@@ -36,11 +36,11 @@ namespace spot
class SPOT_API couvreur99_check_status
{
public:
couvreur99_check_status(const const_tgba_ptr& aut);
couvreur99_check_status(const const_twa_ptr& aut);
~couvreur99_check_status();
const_tgba_ptr aut;
const_twa_ptr aut;
scc_stack root;
typedef std::unordered_map<const state*, int,
......
......@@ -67,7 +67,7 @@ namespace spot
int dftop; // Top of DFS stack.
bool violation; // Whether an accepting run was found.
gv04(const const_tgba_ptr& a, option_map o)
gv04(const const_twa_ptr& a, option_map o)
: emptiness_check(a, o)
{
assert(a->acc().num_sets() <= 1);
......@@ -407,7 +407,7 @@ namespace spot
} // anonymous
emptiness_check_ptr
explicit_gv04_check(const const_tgba_ptr& a, option_map o)
explicit_gv04_check(const const_twa_ptr& a, option_map o)
{
return std::make_shared<gv04>(a, o);
}
......
......@@ -53,5 +53,5 @@ namespace spot
}
\endverbatim */
SPOT_API emptiness_check_ptr
explicit_gv04_check(const const_tgba_ptr& a, option_map o = option_map());
explicit_gv04_check(const const_twa_ptr& a, option_map o = option_map());
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment