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

get rid of some unnecessary code

Browse source 
* spot/priv/enumflags.hh: Delete.
* spot/priv/Makefile.am, debian/copyright: Adjust.
* spot/twaalgos/remfin.cc: Replace the complex enum
definition by a plain enum that is almost not used.
This commit is contained in:
Alexandre Duret-Lutz 2017-09-01 20:58:35 +02:00
parent 15cc7301cc
commit cd6f1c2c3e
4 changed files with 12 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spot/twaalgos/remfin.cc
View file

@ -25,7 +25,6 @@
#include <spot/twaalgos/isdet.hh>
#include <spot/twaalgos/mask.hh>
#include <spot/twaalgos/alternation.hh>
#include "spot/priv/enumflags.hh"
// #define TRACE
#ifdef TRACE
@ -38,21 +37,20 @@ namespace spot
{
namespace
{
enum class strategy_t : unsigned
enum strategy_t
{
trivial = 1,
weak = 2,
alternation = 4,
rabin = 8,
streett = 16,
trivial = 1U,
weak = 2U,
alternation = 4U,
rabin = 8U,
streett = 16U,
};
using strategy_flags = strong_enum_flags<strategy_t>;
using strategy =
std::function<twa_graph_ptr(const const_twa_graph_ptr& aut)>;
twa_graph_ptr
remove_fin_impl(const const_twa_graph_ptr&, const strategy_flags);
remove_fin_impl(const const_twa_graph_ptr&, const strategy_t);
using EdgeMask = std::vector<bool>;
@ -759,11 +757,11 @@ namespace spot
}
twa_graph_ptr remove_fin_impl(const const_twa_graph_ptr& aut,
const strategy_flags skip = {})
const strategy_t skip = {})
{
auto handle = [&](strategy stra, strategy_t type)
auto handle = [&](strategy stra, strategy_t type) -> twa_graph_ptr
{
return (type & ~skip) ? stra(aut) : nullptr;
return (type & skip) ? nullptr : stra(aut);
};
if (auto maybe = handle(trivial_strategy, strategy_t::trivial))