This actually performs three related changes, but separating them
would be quite inconvenient.
1) rename tostring.hh to print.hh a welcome side-effect is that
I could fix several files that included this file for not reason.
2) de-overload some of the to_string functions, and rename them
as follow:
to_string -> print_psl, print_sere, str_psl, str_sere
to_utf8_string -> print_utf8_psl, print_utf8_sere,
str_utf8_psl, str_utf8_sere
to_spin_string -> print_spin_ltl, str_spin_ltl
to_wring_string -> print_wring_ltl, str_wing_ltl
to_lbt_string -> print_lbt_ltl, str_lbt_ltl
to_latex_string -> print_latex_psl, str_latex_psl
to_sclatex_string -> print_sclatex_psl, str_sclatex_psl
Now it is clearer what these functions do, and their restrictions.
3) all those print_* functions now take the stream to write onto
as their first argument. This fixes #88.
* src/ltlvisit/tostring.cc, src/ltlvisit/tostring.hh: Rename into...
* src/ltlvisit/print.cc, src/ltlvisit/print.hh: ... those, and make
the changes listed above.
* doc/org/tut01.org, src/bin/common_output.cc,
src/bin/common_trans.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc,
src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc,
src/bin/randltl.cc, src/ltlparse/ltlparse.yy,
src/ltlvisit/Makefile.am, src/ltlvisit/mark.cc,
src/ltlvisit/relabel.cc, src/ltlvisit/simplify.cc,
src/ltlvisit/snf.cc, src/ta/taexplicit.cc, src/ta/tgtaexplicit.cc,
src/taalgos/tgba2ta.cc, src/tests/equalsf.cc, src/tests/ltl2tgba.cc,
src/tests/ltlrel.cc, src/tests/randtgba.cc, src/tests/reduc.cc,
src/tests/syntimpl.cc, src/tests/tostring.cc, src/twa/bdddict.cc,
src/twa/bddprint.cc, src/twa/taatgba.cc, src/twa/taatgba.hh,
src/twa/twagraph.cc, src/twaalgos/compsusp.cc, src/twaalgos/lbtt.cc,
src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2tgba_fm.cc,
src/twaalgos/neverclaim.cc, src/twaalgos/remprop.cc,
src/twaalgos/stats.cc, wrap/python/ajax/spot.in, wrap/python/spot.py,
wrap/python/spot_impl.i: Adjust.
186 lines
4.3 KiB
C++
186 lines
4.3 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2015 Laboratoire de Recherche et Développement de
|
|
// l'Epita (LRDE).
|
|
//
|
|
// 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 "remprop.hh"
|
|
#include "ltlenv/defaultenv.hh"
|
|
#include "twaalgos/mask.hh"
|
|
#include "misc/casts.hh"
|
|
#include <ctype.h>
|
|
#include <sstream>
|
|
|
|
namespace spot
|
|
{
|
|
remove_ap::~remove_ap()
|
|
{
|
|
for (auto& ap: props_exist)
|
|
ap->destroy();
|
|
for (auto& ap: props_pos)
|
|
ap->destroy();
|
|
for (auto& ap: props_neg)
|
|
ap->destroy();
|
|
}
|
|
|
|
namespace
|
|
{
|
|
static
|
|
void unexpected_char(const char* arg, const char* pos)
|
|
{
|
|
std::ostringstream out;
|
|
out << "unexpected ";
|
|
if (isprint(*pos))
|
|
out << '\'' << *pos << '\'';
|
|
else
|
|
out << "character";
|
|
out << " at position " << pos - arg << " in '";
|
|
out << arg << '\'';
|
|
throw std::invalid_argument(out.str());
|
|
}
|
|
}
|
|
|
|
|
|
void remove_ap::add_ap(const char* arg)
|
|
{
|
|
auto& env = spot::ltl::default_environment::instance();
|
|
auto start = arg;
|
|
while (*start)
|
|
{
|
|
while (*start == ' ' || *start == '\t')
|
|
++start;
|
|
if (!*start)
|
|
break;
|
|
if (*start == ',' || *start == '=')
|
|
unexpected_char(arg, start);
|
|
const spot::ltl::atomic_prop* the_ap = nullptr;
|
|
|
|
if (*start == '"')
|
|
{
|
|
auto end = ++start;
|
|
while (*end && *end != '"')
|
|
{
|
|
if (*end == '\\')
|
|
++end;
|
|
++end;
|
|
}
|
|
if (!*end)
|
|
{
|
|
std::string s = "missing closing '\"' in ";
|
|
s += arg;
|
|
throw std::invalid_argument(s);
|
|
}
|
|
std::string ap(start, end - start);
|
|
auto* t = env.require(ap);
|
|
the_ap = down_cast<const spot::ltl::atomic_prop*>(t);
|
|
do
|
|
++end;
|
|
while (*end == ' ' || *end == '\t');
|
|
start = end;
|
|
}
|
|
else
|
|
{
|
|
auto end = start;
|
|
while (*end && *end != ',' && *end != '=')
|
|
++end;
|
|
auto rend = end;
|
|
while (rend > start && (rend[-1] == ' ' || rend[-1] == '\t'))
|
|
--rend;
|
|
std::string ap(start, rend - start);
|
|
auto* t = env.require(ap);
|
|
the_ap = down_cast<const spot::ltl::atomic_prop*>(t);
|
|
start = end;
|
|
}
|
|
if (*start)
|
|
{
|
|
if (!(*start == ',' || *start == '='))
|
|
unexpected_char(arg, start);
|
|
if (*start == '=')
|
|
{
|
|
do
|
|
++start;
|
|
while (*start == ' ' || *start == '\t');
|
|
if (*start == '0')
|
|
props_neg.insert(the_ap);
|
|
else if (*start == '1')
|
|
props_pos.insert(the_ap);
|
|
else
|
|
unexpected_char(arg, start);
|
|
the_ap = nullptr;
|
|
do
|
|
++start;
|
|
while (*start == ' ' || *start == '\t');
|
|
}
|
|
if (*start)
|
|
{
|
|
if (*start != ',')
|
|
unexpected_char(arg, start);
|
|
++start;
|
|
}
|
|
}
|
|
if (the_ap)
|
|
props_exist.insert(the_ap);
|
|
}
|
|
}
|
|
|
|
twa_graph_ptr remove_ap::strip(const_twa_graph_ptr aut) const
|
|
{
|
|
bdd restrict = bddtrue;
|
|
bdd exist = bddtrue;
|
|
auto d = aut->get_dict();
|
|
|
|
twa_graph_ptr res = make_twa_graph(d);
|
|
res->copy_ap_of(aut);
|
|
res->prop_copy(aut, { true, true, false, false });
|
|
res->copy_acceptance_of(aut);
|
|
|
|
for (auto ap: props_exist)
|
|
{
|
|
int v = d->has_registered_proposition(ap, aut);
|
|
if (v >= 0)
|
|
{
|
|
exist &= bdd_ithvar(v);
|
|
d->unregister_variable(v, res);
|
|
}
|
|
}
|
|
for (auto ap: props_pos)
|
|
{
|
|
int v = d->has_registered_proposition(ap, aut);
|
|
if (v >= 0)
|
|
{
|
|
restrict &= bdd_ithvar(v);
|
|
d->unregister_variable(v, res);
|
|
}
|
|
}
|
|
for (auto ap: props_neg)
|
|
{
|
|
int v = d->has_registered_proposition(ap, aut);
|
|
if (v >= 0)
|
|
{
|
|
restrict &= bdd_nithvar(v);
|
|
d->unregister_variable(v, res);
|
|
}
|
|
}
|
|
|
|
transform_accessible(aut, res, [&](unsigned, bdd& cond,
|
|
acc_cond::mark_t&, unsigned)
|
|
{
|
|
cond = bdd_restrict(bdd_exist(cond, exist),
|
|
restrict);
|
|
});
|
|
return res;
|
|
}
|
|
}
|