rename src/ as spot/ and use include <spot/...>
* NEWS: Mention the change. * src/: Rename as ... * spot/: ... this, adjust all headers to include <spot/...> instead of "...", and adjust all Makefile.am to search headers from the top-level directory. * HACKING: Add conventions about #include. * spot/sanity/style.test: Add a few more grep to catch cases that do not follow these conventions. * .gitignore, Makefile.am, README, bench/stutter/Makefile.am, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, debian/rules, doc/Doxyfile.in, doc/Makefile.am, doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org, doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org, doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am, iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in, wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py, wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
1fddfe60ec
commit
f120dd3206
529 changed files with 1308 additions and 1262 deletions
|
|
@ -1,172 +0,0 @@
|
|||
// -*- 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 "twaalgos/mask.hh"
|
||||
#include "misc/casts.hh"
|
||||
#include <ctype.h>
|
||||
#include <sstream>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
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 start = arg;
|
||||
while (*start)
|
||||
{
|
||||
while (*start == ' ' || *start == '\t')
|
||||
++start;
|
||||
if (!*start)
|
||||
break;
|
||||
if (*start == ',' || *start == '=')
|
||||
unexpected_char(arg, start);
|
||||
formula 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);
|
||||
the_ap = formula::ap(ap);
|
||||
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);
|
||||
the_ap = formula::ap(ap);
|
||||
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;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue