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

Replace << "c" by << 'c', and check for it in style.sh

Browse source 
* src/sanity/style.test: Add a test.
* iface/dve2/dve2.cc, iface/dve2/dve2check.cc, src/bin/common_output.cc,
src/bin/dstar2tgba.cc, src/bin/ltl2tgba.cc, src/bin/ltlcross.cc,
src/dstarparse/dra2ba.cc, src/dstarparse/fmterror.cc,
src/dstarparse/nsa2tgba.cc, src/kripke/kripkeprint.cc,
src/kripkeparse/fmterror.cc, src/ltlast/atomic_prop.cc,
src/ltlast/bunop.cc, src/ltltest/ltlrel.cc, src/ltltest/reduc.cc,
src/ltltest/syntimpl.cc, src/ltlvisit/dotty.cc, src/ltlvisit/lbt.cc,
src/ltlvisit/randomltl.cc, src/ltlvisit/relabel.cc,
src/ltlvisit/simplify.cc, src/ltlvisit/tostring.cc, src/misc/bitvect.cc,
src/misc/optionmap.cc, src/misc/timer.cc, src/neverparse/fmterror.cc,
src/priv/freelist.cc, src/saba/sabacomplementtgba.cc,
src/sabaalgos/sabadotty.cc, src/taalgos/dotty.cc,
src/taalgos/minimize.cc, src/tgba/bdddict.cc, src/tgba/bddprint.cc,
src/tgba/futurecondcol.cc, src/tgba/taatgba.hh,
src/tgba/tgbakvcomplement.cc, src/tgba/tgbasafracomplement.cc,
src/tgbaalgos/compsusp.cc, src/tgbaalgos/cycles.cc,
src/tgbaalgos/dotty.cc, src/tgbaalgos/dtbasat.cc,
src/tgbaalgos/dtgbasat.cc, src/tgbaalgos/emptiness.cc,
src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gv04.cc,
src/tgbaalgos/lbtt.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/neverclaim.cc,
src/tgbaalgos/powerset.cc, src/tgbaalgos/replayrun.cc,
src/tgbaalgos/save.cc, src/tgbaalgos/scc.cc, src/tgbaalgos/sccfilter.cc,
src/tgbaalgos/weight.cc, src/tgbaalgos/word.cc,
src/tgbaparse/fmterror.cc, src/tgbatest/bitvect.cc,
src/tgbatest/complementation.cc, src/tgbatest/intvcmp2.cc,
src/tgbatest/intvcomp.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc: Replace << "c" by << 'c' when
appropriate.
This commit is contained in:
Alexandre Duret-Lutz 2014-01-29 14:48:52 +01:00
parent 49c66c6319
commit ba5aff2460
64 changed files with 417 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tgbaalgos/compsusp.cc
View file

@ -183,9 +183,9 @@ namespace spot
return ltl::unop::instance(ltl::unop::G, i->second->clone());
std::ostringstream s;
s << "[";
s << '[';
to_string(f, s);
s << "]";
s << ']';
res = suspenv.require(s.str());
// We have to clone f, because it is not always a sub-tree
// of the original formula. (Think n-ary operators.)

4
src/tgbaalgos/cycles.cc
View file

@ -182,11 +182,11 @@ namespace spot
++i;
do
{
std::cout << aut_->format_state(i->ts->first) << " ";
std::cout << aut_->format_state(i->ts->first) << ' ';
++i;
}
while (i != dfs_.end());
std::cout << "\n";
std::cout << '\n';
return true;
}

13
src/tgbaalgos/dotty.cc
View file

@ -1,7 +1,8 @@
// Copyright (C) 2011, 2012 Laboratoire de Recherche et Developpement de
// l'Epita (LRDE).
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2012, 2014 Laboratoire de Recherche et
// Developpement 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
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
// This file is part of Spot, a model checking library.
@ -56,7 +57,7 @@ namespace spot
void
end()
{
os_ << "}" << std::endl;
os_ << '}' << std::endl;
}
void
@ -83,7 +84,7 @@ namespace spot
accepting = false;
}
os_ << " " << n << " "
os_ << " " << n << ' '
<< dd_->state_decl(aut_, s, n, si,
escape_str(aut_->format_state(s)),
accepting)
@ -109,7 +110,7 @@ namespace spot
label += s;
}
os_ << " " << in << " -> " << out << " "
os_ << " " << in << " -> " << out << ' '
<< dd_->link_decl(aut_, in_s, in, out_s, out, si,
escape_str(label))
<< '\n';

63
src/tgbaalgos/dtbasat.cc
View file

@ -177,25 +177,25 @@ namespace spot
std::ostream& operator<<(std::ostream& os, const state_pair& p)
{
os << "<" << p.a << "," << p.b << ">";
os << '<' << p.a << ',' << p.b << '>';
return os;
}
std::ostream& operator<<(std::ostream& os, const transition& t)
{
os << "<" << t.src << ","
os << '<' << t.src << ','
<< bdd_format_formula(debug_dict, t.cond)
<< "," << t.dst << ">";
<< ',' << t.dst << '>';
return os;
}
std::ostream& operator<<(std::ostream& os, const path& p)
{
os << "<"
<< p.src_cand << ","
<< p.src_ref << ","
<< p.dst_cand << ","
<< p.dst_ref << ">";
os << '<'
<< p.src_cand << ','
<< p.src_ref << ','
<< p.dst_cand << ','
<< p.dst_ref << '>';
return os;
}
@ -366,8 +366,8 @@ namespace spot
#if DEBUG
debug_dict = ref->get_dict();
dout << "ref_size: " << ref_size << "\n";
dout << "cand_size: " << d.cand_size << "\n";
dout << "ref_size: " << ref_size << '\n';
dout << "cand_size: " << d.cand_size << '\n';
#endif
dout << "symmetry-breaking clauses\n";
@ -382,7 +382,7 @@ namespace spot
{
transition t(i, s, k);
int ti = d.transid[t];
dout << "¬" << t << "\n";
dout << "¬" << t << '\n';
out << -ti << " 0\n";
++nclauses;
}
@ -409,7 +409,7 @@ namespace spot
if (q2 != d.cand_size)
out << " ∨ ";
}
out << "\n";
out << '\n';
#endif
for (int q2 = 1; q2 <= d.cand_size; q2++)
@ -417,7 +417,7 @@ namespace spot
transition t(q1, s, q2);
int ti = d.transid[t];
out << ti << " ";
out << ti << ' ';
}
out << "0\n";
@ -426,7 +426,7 @@ namespace spot
}
dout << "(2) the initial state is reachable\n";
dout << state_pair(1, 1) << "\n";
dout << state_pair(1, 1) << '\n';
out << d.prodid[state_pair(1, 1)] << " 0\n";
++nclauses;
@ -461,8 +461,8 @@ namespace spot
if (pit->second == succ)
continue;
dout << pit->first << " ∧ " << t << "δ → " << p2 << "\n";
out << -pit->second << " " << -ti << " "
dout << pit->first << " ∧ " << t << "δ → " << p2 << '\n';
out << -pit->second << ' ' << -ti << ' '
<< succ << " 0\n";
++nclauses;
}
@ -492,7 +492,7 @@ namespace spot
path p1(q1, q1p, q2, q2p);
dout << "(4&5) matching paths from reference based on "
<< p1 << "\n";
<< p1 << '\n';
int pid1;
if (q1 == q2 && q1p == q2p)
@ -530,7 +530,7 @@ namespace spot
dout << p1 << "R ∧ " << t << "δ → ¬" << t
<< "F\n";
out << -pid1 << " " << -ti << " "
out << -pid1 << ' ' << -ti << ' '
<< -ta << " 0\n";
++nclauses;
}
@ -556,7 +556,7 @@ namespace spot
dout << p1 << "R ∧ " << t << "δ → " << p2
<< "R\n";
out << -pid1 << " " << -ti << " "
out << -pid1 << ' ' << -ti << ' '
<< pid2 << " 0\n";
++nclauses;
}
@ -585,7 +585,7 @@ namespace spot
{
path p1(q1, q1p, q2, q2p);
dout << "(6&7) matching paths from candidate based on "
<< p1 << "\n";
<< p1 << '\n';
int pid1;
if (q1 == q2 && q1p == q2p)
@ -625,7 +625,7 @@ namespace spot
dout << p1 << "C ∧ " << t << "δ → " << t
<< "F\n";
out << -pid1 << " " << -ti << " " << ta
out << -pid1 << ' ' << -ti << ' ' << ta
<< " 0\n";
++nclauses;
}
@ -651,8 +651,8 @@ namespace spot
dout << p1 << "C ∧ " << t << "δ ∧ ¬"
<< t << "F → " << p2 << "C\n";
out << -pid1 << " " << -ti << " "
<< ta << " " << pid2 << " 0\n";
out << -pid1 << ' ' << -ti << ' '
<< ta << ' ' << pid2 << " 0\n";
++nclauses;
}
}
@ -662,7 +662,7 @@ namespace spot
}
}
out.seekp(0);
out << "p cnf " << d.nvars << " " << nclauses.nb_clauses();
out << "p cnf " << d.nvars << ' ' << nclauses.nb_clauses();
return std::make_pair(d.nvars, nclauses.nb_clauses());
}
@ -719,7 +719,7 @@ namespace spot
last_aut_trans->condition = t->second.cond;
last_sat_trans = &t->second;
dout << v << "\t" << t->second << "δ\n";
dout << v << '\t' << t->second << "δ\n";
// Mark the transition as accepting if the source is.
if (state_based
@ -732,7 +732,7 @@ namespace spot
t = satdict.revtransacc.find(v);
if (t != satdict.revtransacc.end())
{
dout << v << "\t" << t->second << "F\n";
dout << v << '\t' << t->second << "F\n";
if (last_sat_trans && t->second == *last_sat_trans)
{
assert(!state_based);
@ -757,7 +757,7 @@ namespace spot
for (std::map<state_pair, int>::const_iterator pit =
satdict.prodid.begin(); pit != satdict.prodid.end(); ++pit)
if (positive.find(pit->second) != positive.end())
dout << pit->second << "\t" << pit->first << "\n";
dout << pit->second << '\t' << pit->first << "C\n";
else
dout << -pit->second << "\t¬" << pit->first << "C\n";
@ -766,17 +766,16 @@ namespace spot
satdict.pathid_cand.begin();
pit != satdict.pathid_cand.end(); ++pit)
if (positive.find(pit->second) != positive.end())
dout << pit->second << "\t" << pit->first << "C\n";
dout << pit->second << '\t' << pit->first << "C\n";
else
dout << -pit->second << "\t¬" << pit->first << "C\n";
dout << "--- pathid_ref variables ---\n";
for (std::map<path, int>::const_iterator pit =
satdict.pathid_ref.begin();
pit != satdict.pathid_ref.end(); ++pit)
if (positive.find(pit->second) != positive.end())
dout << pit->second << "\t" << pit->first << "R\n";
dout << pit->second << '\t' << pit->first << "R\n";
else
dout << -pit->second << "\t¬" << pit->first << "C\n";
@ -785,7 +784,7 @@ namespace spot
satdict.pathcand.begin();
pit != satdict.pathcand.end(); ++pit)
if (positive.find(pit->second) != positive.end())
dout << pit->second << "\t" << pit->first << "C\n";
dout << pit->second << '\t' << pit->first << "C\n";
else
dout << -pit->second << "\t¬" << pit->first << "C\n";
@ -850,7 +849,7 @@ namespace spot
if (show && res)
dotty_reachable(std::cout, res);
trace << "dtba_sat_synthetize(...) = " << res << "\n";
trace << "dtba_sat_synthetize(...) = " << res << '\n';
return res;
}

64
src/tgbaalgos/dtgbasat.cc
View file

@ -213,31 +213,31 @@ namespace spot
std::ostream& operator<<(std::ostream& os, const transition& t)
{
os << "<" << t.src << ","
os << '<' << t.src << ','
<< bdd_format_formula(debug_dict, t.cond)
<< "," << t.dst << ">";
<< ',' << t.dst << '>';
return os;
}
std::ostream& operator<<(std::ostream& os, const transition_acc& t)
{
os << "<" << t.src << ","
<< bdd_format_formula(debug_dict, t.cond) << ","
os << '<' << t.src << ','
<< bdd_format_formula(debug_dict, t.cond) << ','
<< bdd_format_accset(debug_dict, t.acc)
<< "," << t.dst << ">";
<< ',' << t.dst << '>';
return os;
}
std::ostream& operator<<(std::ostream& os, const path& p)
{
os << "<"
<< p.src_cand << ","
<< p.src_ref << ","
<< p.dst_cand << ","
os << '<'
<< p.src_cand << ','
<< p.src_ref << ','
<< p.dst_cand << ','
<< p.dst_ref << ", "
<< bdd_format_accset(debug_dict, p.acc_cand) << ", "
<< bdd_format_accset(debug_dict, p.acc_ref) << ">";
<< bdd_format_accset(debug_dict, p.acc_ref) << '>';
return os;
}
@ -511,8 +511,8 @@ namespace spot
#if DEBUG
debug_dict = ref->get_dict();
dout << "ref_size: " << ref_size << "\n";
dout << "cand_size: " << d.cand_size << "\n";
dout << "ref_size: " << ref_size << '\n';
dout << "cand_size: " << d.cand_size << '\n';
#endif
dout << "symmetry-breaking clauses\n";
@ -527,7 +527,7 @@ namespace spot
{
transition t(i, s, k);
int ti = d.transid[t];
dout << "¬" << t << "\n";
dout << "¬" << t << '\n';
out << -ti << " 0\n";
++nclauses;
}
@ -554,7 +554,7 @@ namespace spot
if (q2 != d.cand_size)
out << " ∨ ";
}
out << "\n";
out << '\n';
#endif
for (int q2 = 1; q2 <= d.cand_size; q2++)
@ -562,7 +562,7 @@ namespace spot
transition t(q1, s, q2);
int ti = d.transid[t];
out << ti << " ";
out << ti << ' ';
}
out << "0\n";
++nclauses;
@ -570,7 +570,7 @@ namespace spot
}
dout << "(9) the initial state is reachable\n";
dout << path(1, 1) << "\n";
dout << path(1, 1) << '\n';
out << d.pathid[path(1, 1)] << " 0\n";
++nclauses;
@ -605,8 +605,8 @@ namespace spot
if (p1id == succ)
continue;
dout << p1 << " ∧ " << t << "δ → " << p2 << "\n";
out << -p1id << " " << -ti << " " << succ << " 0\n";
dout << p1 << " ∧ " << t << "δ → " << p2 << '\n';
out << -p1id << ' ' << -ti << ' ' << succ << " 0\n";
++nclauses;
}
}
@ -639,7 +639,7 @@ namespace spot
path p(q1, q1p, q2, q2p,
d.all_cand_acc[f], d.all_ref_acc[fp]);
dout << "(11&12&13) paths from " << p << "\n";
dout << "(11&12&13) paths from " << p << '\n';
int pid = d.pathid[p];
@ -698,7 +698,7 @@ namespace spot
}
out << ")\n";
#endif // DEBUG
out << -pid << " " << -ti;
out << -pid << ' ' << -ti;
// 11
bdd all_f = d.all_cand_acc.back();
@ -712,7 +712,7 @@ namespace spot
one, q1);
int tai = d.transaccid[ta];
assert(tai != 0);
out << " " << -tai;
out << ' ' << -tai;
}
out << " 0\n";
++nclauses;
@ -754,8 +754,8 @@ namespace spot
int tai = d.transaccid[ta];
assert(tai != 0);
out << -pid << " " << -ti
<< " " << tai << " 0\n";
out << -pid << ' ' << -ti
<< ' ' << tai << " 0\n";
++nclauses;
}
}
@ -799,9 +799,9 @@ namespace spot
transition_acc ta(q2, l, a, q3);
out << " ∧ ¬" << ta << "FC";
}
out << " → " << p2 << "\n";
out << " → " << p2 << '\n';
#endif
out << -pid << " " << -ti << " ";
out << -pid << ' ' << -ti << ' ';
bdd biga = d.all_cand_acc[f];
while (biga != bddfalse)
{
@ -810,7 +810,7 @@ namespace spot
transition_acc ta(q2, l, a, q3);
int tai = d.transaccid[ta];
out << -tai << " ";
out << -tai << ' ';
}
biga = d.all_cand_acc.back()
- d.all_cand_acc[f];
@ -821,7 +821,7 @@ namespace spot
transition_acc ta(q2, l, a, q3);
int tai = d.transaccid[ta];
out << tai << " ";
out << tai << ' ';
}
out << p2id << " 0\n";
@ -836,7 +836,7 @@ namespace spot
}
}
out.seekp(0);
out << "p cnf " << d.nvars << " " << nclauses.nb_clauses();
out << "p cnf " << d.nvars << ' ' << nclauses.nb_clauses();
return std::make_pair(d.nvars, nclauses.nb_clauses());
}
@ -891,7 +891,7 @@ namespace spot
last_aut_trans->condition = t->second.cond;
last_sat_trans = &t->second;
dout << v << "\t" << t->second << "δ\n";
dout << v << '\t' << t->second << "δ\n";
if (state_based)
{
@ -910,7 +910,7 @@ namespace spot
// increasing order.
if (ta != satdict.revtransaccid.end())
{
dout << v << "\t" << ta->second << "F\n";
dout << v << '\t' << ta->second << "F\n";
if (last_sat_trans &&
ta->second.src == last_sat_trans->src &&
@ -933,7 +933,7 @@ namespace spot
satdict.pathid.begin();
pit != satdict.pathid.end(); ++pit)
if (positive.find(pit->second) != positive.end())
dout << pit->second << "\t" << pit->first << "C\n";
dout << pit->second << '\t' << pit->first << "C\n";
#endif
a->merge_transitions();
@ -999,7 +999,7 @@ namespace spot
if (show && res)
dotty_reachable(std::cout, res);
trace << "dtgba_sat_synthetize(...) = " << res << "\n";
trace << "dtgba_sat_synthetize(...) = " << res << '\n';
return res;
}

8
src/tgbaalgos/emptiness.cc
View file

@ -89,7 +89,7 @@ namespace spot
os << " " << a->format_state(i->s) << std::endl;
os << " | ";
bdd_print_formula(os, d, i->label);
os << "\t";
os << '\t';
bdd_print_accset(os, d, i->acc);
os << std::endl;
}
@ -100,9 +100,9 @@ namespace spot
os << " " << a->format_state(i->s) << std::endl;
os << " | ";
bdd_print_formula(os, d, i->label);
os << "\t";
os << '\t';
bdd_print_accset(os, d, i->acc);
os << std::endl;
os << '\n';
}
return os;
}
@ -288,7 +288,7 @@ namespace spot
std::string format_state(const tgba* a, const state* s, int n)
{
std::ostringstream os;
os << a->format_state(s) << " (" << n << ")";
os << a->format_state(s) << " (" << n << ')';
return os.str();
}
}

4
src/tgbaalgos/gtec/gtec.cc
View file

@ -392,7 +392,7 @@ namespace spot
for (todo_list::const_iterator ti = todo.begin(); ti != todo.end(); ++ti)
{
++pos;
os << "#" << pos << " s:" << ti->s << " n:" << ti->n
os << '#' << pos << " s:" << ti->s << " n:" << ti->n
<< " q:{";
for (succ_queue::const_iterator qi = ti->q.begin(); qi != ti->q.end();)
{
@ -401,7 +401,7 @@ namespace spot
if (qi != ti->q.end())
os << ", ";
}
os << "}" << std::endl;
os << '}' << std::endl;
}
}

21
src/tgbaalgos/gv04.cc
View file

@ -103,7 +103,7 @@ namespace spot
trace << "Main iteration (top = " << top
<< ", dftop = " << dftop
<< ", s = " << a_->format_state(stack[dftop].s)
<< ")" << std::endl;
<< ')' << std::endl;
tgba_succ_iterator* iter = stack[dftop].lasttr;
bool cont;
@ -170,7 +170,7 @@ namespace spot
push(const state* s, bool accepting)
{
trace << " push(s = " << a_->format_state(s)
<< ", accepting = " << accepting << ")" << std::endl;
<< ", accepting = " << accepting << ")\n";
h[s] = ++top;
@ -194,7 +194,7 @@ namespace spot
void
pop()
{
trace << " pop()" << std::endl;
trace << " pop()\n";
int p = stack[dftop].pre;
if (p >= 0)
@ -217,10 +217,9 @@ namespace spot
lowlinkupdate(int f, int t)
{
trace << " lowlinkupdate(f = " << f << ", t = " << t
<< ")" << std::endl
<< " t.lowlink = " << stack[t].lowlink << std::endl
<< " f.lowlink = " << stack[f].lowlink << std::endl
<< " f.acc = " << stack[f].acc << std::endl;
<< ")\n t.lowlink = " << stack[t].lowlink
<< "\n f.lowlink = " << stack[f].lowlink
<< "\n f.acc = " << stack[f].acc << '\n';
int stack_t_lowlink = stack[t].lowlink;
if (stack_t_lowlink <= stack[f].lowlink)
{
@ -228,16 +227,16 @@ namespace spot
violation = true;
stack[f].lowlink = stack_t_lowlink;
trace << " f.lowlink updated to "
<< stack[f].lowlink << std::endl;
<< stack[f].lowlink << '\n';
}
}
virtual std::ostream&
print_stats(std::ostream& os) const
{
os << h.size() << " unique states visited" << std::endl;
os << transitions() << " transitions explored" << std::endl;
os << max_depth() << " items max on stack" << std::endl;
os << h.size() << " unique states visited\n";
os << transitions() << " transitions explored\n";
os << max_depth() << " items max on stack\n";
return os;
}

16
src/tgbaalgos/lbtt.cc
View file

@ -60,7 +60,7 @@ namespace spot
{
bdd acc = bdd_satone(b);
b -= acc;
os << sm[acc] << " ";
os << sm[acc] << ' ';
}
return os;
}
@ -126,14 +126,14 @@ namespace spot
else
body_ << " -1";
}
body_ << "\n";
body_ << '\n';
}
void
process_link(const state*, int,
const state*, int out, const tgba_succ_iterator* si)
{
body_ << out - 1 << " ";
body_ << out - 1 << ' ';
if (!sba_format_)
{
acs_.split(body_, si->current_acceptance_conditions());
@ -143,18 +143,18 @@ namespace spot
aut_->get_dict());
to_lbt_string(f, body_);
f->destroy();
body_ << "\n";
body_ << '\n';
}
void
end()
{
os_ << seen.size() << " ";
os_ << seen.size() << ' ';
if (sba_format_)
os_ << "1";
os_ << '1';
else
os_ << aut_->number_of_acceptance_conditions() << "t";
os_ << "\n" << body_.str() << "-1" << std::endl;
os_ << aut_->number_of_acceptance_conditions() << 't';
os_ << '\n' << body_.str() << "-1" << std::endl;
}
private:

10
src/tgbaalgos/ltl2tgba_fm.cc
View file

@ -309,7 +309,7 @@ namespace spot
for (auto& fi: next_map)
{
os << " " << fi.second << ": Next[";
to_string(fi.first, os) << "]" << std::endl;
to_string(fi.first, os) << ']' << std::endl;
}
os << "Shared Dict:" << std::endl;
dict->dump(os);
@ -447,7 +447,7 @@ namespace spot
trace_ltl_bdd(const translate_dict& d, bdd f)
{
std::cerr << "Displaying BDD ";
bdd_print_set(std::cerr, d.dict, f) << ":" << std::endl;
bdd_print_set(std::cerr, d.dict, f) << ":\n";
minato_isop isop(f);
bdd cube;
@ -459,7 +459,7 @@ namespace spot
bdd_print_set(std::cerr, d.dict, label) << " => ";
bdd_print_set(std::cerr, d.dict, dest_bdd) << " = "
<< to_string(dest)
<< std::endl;
<< '\n';
dest->destroy();
}
return std::cerr;
@ -970,7 +970,7 @@ namespace spot
// std::cerr << "translate_ratexp[" << to_string(f);
// if (to_concat)
// std::cerr << ", " << to_string(to_concat);
// std::cerr << "]" << std::endl;
// std::cerr << ']' << std::endl;
// ++indent;
bdd res;
if (!f->is_boolean())
@ -1690,7 +1690,7 @@ namespace spot
// the case handling G.
bdd res = recurse(sub, recurring_);
//std::cerr << "== in And (" << to_string(sub)
// << ")" << std::endl;
// << ')' << std::endl;
// trace_ltl_bdd(dict_, res);
res_ &= res;
}

6
src/tgbaalgos/minimize.cc
View file

@ -64,14 +64,14 @@ namespace spot
static std::ostream&
dump_hash_set(const hash_set* hs, const tgba* aut, std::ostream& out)
{
out << "{";
out << '{';
const char* sep = "";
for (hash_set::const_iterator i = hs->begin(); i != hs->end(); ++i)
{
out << sep << aut->format_state(*i);
sep = ", ";
}
out << "}";
out << '}';
return out;
}
@ -453,7 +453,7 @@ namespace spot
#ifdef TRACE
trace << "Final partition: ";
for (partition_t::const_iterator i = done.begin(); i != done.end(); ++i)
trace << format_hash_set(*i, det_a) << " ";
trace << format_hash_set(*i, det_a) << ' ';
trace << std::endl;
#endif

6
src/tgbaalgos/neverclaim.cc
View file

@ -67,7 +67,7 @@ namespace spot
os_ << " fi;\n";
if (accept_all_ != -1)
os_ << "accept_all:\n skip\n";
os_ << "}" << std::endl;
os_ << '}' << std::endl;
init_->destroy();
}
@ -138,7 +138,7 @@ namespace spot
{
if (fi_needed_ != 0)
os_ << " fi;\n";
os_ << get_state_label(s, n) << ":";
os_ << get_state_label(s, n) << ':';
if (comments_)
os_ << " /* " << aut_->format_state(s) << " */";
os_ << "\n if\n :: (0) -> goto "
@ -157,7 +157,7 @@ namespace spot
{
if (fi_needed_)
os_ << " fi;\n";
os_ << get_state_label(s, n) << ":";
os_ << get_state_label(s, n) << ':';
if (comments_)
os_ << " /* " << aut_->format_state(s) << " */";
os_ << "\n if\n";

16
src/tgbaalgos/powerset.cc
View file

@ -157,16 +157,16 @@ namespace spot
cycles_left_ = threshold_;
run(m);
// std::cerr << "SCC #" << m << "\n";
// std::cerr << "SCC #" << m << '\n';
// std::cerr << "REJECT: ";
// print_set(std::cerr, reject_) << "\n";
// print_set(std::cerr, reject_) << '\n';
// std::cerr << "ALL: ";
// print_set(std::cerr, all_) << "\n";
// print_set(std::cerr, all_) << '\n';
// for (set_set::const_iterator j = accept_.begin();
// j != accept_.end(); ++j)
// {
// std::cerr << "ACCEPT: ";
// print_set(std::cerr, *j) << "\n";
// print_set(std::cerr, *j) << '\n';
// }
bdd acc = aut_->all_acceptance_conditions();
@ -232,8 +232,8 @@ namespace spot
{
o << "{ ";
for (auto i: s)
o << i << " ";
o << "}";
o << i << ' ';
o << '}';
return o;
}
@ -247,13 +247,13 @@ namespace spot
bool is_acc = is_cycle_accepting(i, ts);
do
{
// std::cerr << aut_->format_state(i->ts->first) << " ";
// std::cerr << aut_->format_state(i->ts->first) << ' ';
++i;
}
while (i != dfs_.end());
// std::cerr << " acc=" << is_acc << " (";
// bdd_print_accset(std::cerr, aut_->get_dict(), s) << ") ";
// print_set(std::cerr, ts) << "\n";
// print_set(std::cerr, ts) << '\n';
if (is_acc)
{
accept_.push_back(ts);

4
src/tgbaalgos/replayrun.cc
View file

@ -38,7 +38,7 @@ namespace spot
std::string s = a->transition_annotation(i);
if (s == "")
return;
os << " " << s;
os << ' ' << s;
}
}
@ -210,7 +210,7 @@ namespace spot
os << " | ";
print_annotation(os, a, j);
bdd_print_formula(os, a->get_dict(), label);
os << "\t";
os << '\t';
bdd_print_accset(os, a->get_dict(), acc);
os << std::endl;
}

4
src/tgbaalgos/save.cc
View file

@ -56,7 +56,7 @@ namespace spot
do
{
state* dest = si->current_state();
os_ << "\"" << cur << "\", \"";
os_ << '"' << cur << "\", \"";
escape_str(os_, aut_->format_state(dest));
os_ << "\", \"";
escape_str(os_, bdd_format_formula(d, si->current_condition()));
@ -87,7 +87,7 @@ namespace spot
s.resize(s.size() - 1);
}
os_ << " \"";
escape_str(os_, s) << "\"";
escape_str(os_, s) << '"';
}
return os_;
}

6
src/tgbaalgos/scc.cc
View file

@ -493,7 +493,7 @@ namespace spot
size_t n = m.states_of(state).size();
ostr << " (" << n << " state";
if (n > 1)
ostr << "s";
ostr << 's';
ostr << ")\\naccs=";
escape_str(ostr, bdd_format_accset(m.get_aut()->get_dict(),
m.acc_set_of(state)));
@ -515,7 +515,7 @@ namespace spot
m.aprec_set_of(state)));
ostr << "]\\n useful=[";
escape_str(ostr, bdd_format_accset(m.get_aut()->get_dict(),
m.useful_acc_of(state))) << "]";
m.useful_acc_of(state))) << ']';
}
out << " " << state << " [shape=box,"
@ -543,7 +543,7 @@ namespace spot
}
}
out << "}" << std::endl;
out << '}' << std::endl;
return out;
}

10
src/tgbaalgos/sccfilter.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2010, 2011, 2012, 2013 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -166,7 +166,7 @@ namespace spot
for (unsigned n = 0; n < c; ++n)
{
//std::cerr << "SCC #" << n << "\n";
//std::cerr << "SCC #" << n << '\n';
if (!sm.accepting(n))
continue;
@ -191,7 +191,7 @@ namespace spot
one = bdd_high(one);
}
int id = resacc.id();
//std::cerr << resacc << " -> " << res << "\n";
//std::cerr << resacc << " -> " << res << '\n';
remap_[n][id] = res;
}
}
@ -447,7 +447,7 @@ namespace spot
{
if (!sm->accepting(n))
continue;
//std::cerr << "SCC " << n << "\n";
//std::cerr << "SCC " << n << '\n';
bdd useful = useful_table[n];
int missing = max_num - max_table[n];

9
src/tgbaalgos/weight.cc
View file

@ -1,7 +1,8 @@
// Copyright (C) 2011 Laboratoire de Recherche et Developpement de
// l'Epita.
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2014 Laboratoire de Recherche et Developpement
// de l'Epita.
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
// This file is part of Spot, a model checking library.
@ -114,7 +115,7 @@ namespace spot
{
weight::weight_vector::const_iterator it;
for (it = w.m.begin(); it != w.m.end(); ++it)
os << "(" << it->first << "," << it->second << ")";
os << '(' << it->first << ',' << it->second << ')';
return os;
}

6
src/tgbaalgos/word.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2013 Laboratoire de Recherche et Développement de
// l'Epita (LRDE).
// Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -102,7 +102,7 @@ namespace spot
notfirst = true;
bdd_print_formula(os, d, *i);
}
os << "}";
os << '}';
return os;
}