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

Fixes to pass sanity checks.

Browse source 
* src/ta/taproduct.cc, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh,
src/taalgos/emptinessta.cc, src/tgbatest/ltl2ta.test: 80 columns.
* src/ta/tgta.hh, src/ta/tgtaproduct.hh, src/taalgos/emptinessta.hh,
src/taalgos/tgba2ta.hh: Fix include gards.
* src/taalgos/tgba2ta.hh: Remove superfluous includes.
* src/taalgos/tgba2ta.cc: Add missing include.
* src/tgbatest/ltl2tgba.cc: Fix use of bdd_true().
This commit is contained in:
Alexandre Duret-Lutz 2012-05-26 16:23:31 +02:00
parent dcc809ff4a
commit 67bbe6a6c7
10 changed files with 87 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ta/taproduct.cc
View file

@ -1,5 +1,6 @@
// Copyright (C) 2011 Laboratoire de Recherche et Developpement
// de l Epita (LRDE).
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2012 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
//
//
// This file is part of Spot, a model checking library.
@ -68,8 +69,9 @@ namespace spot
////////////////////////////////////////////////////////////
// ta_succ_iterator_product
ta_succ_iterator_product::ta_succ_iterator_product(const state_ta_product* s,
const ta* t, const kripke* k) :
source_(s), ta_(t), kripke_(k)
const ta* t,
const kripke* k)
: source_(s), ta_(t), kripke_(k)
{
kripke_source_condition = kripke_->state_condition(s->get_kripke_state());
@ -269,7 +271,8 @@ namespace spot
bdd kripke_init_state_condition = kripke_->state_condition(
kripke_init_state);
spot::state* artificial_initial_state = ta_->get_artificial_initial_state();
spot::state* artificial_initial_state =
ta_->get_artificial_initial_state();
if (artificial_initial_state != 0)
{
@ -358,8 +361,6 @@ namespace spot
return ta_->is_livelock_accepting_state(stp->get_ta_state());
}
bool
ta_product::is_initial_state(const spot::state* s) const
{
@ -411,17 +412,14 @@ namespace spot
}
ta_succ_iterator_product_by_changeset::ta_succ_iterator_product_by_changeset(
const state_ta_product* s, const ta* t, const kripke* k, bdd changeset) :
ta_succ_iterator_product(s, t, k)
ta_succ_iterator_product_by_changeset::
ta_succ_iterator_product_by_changeset(const state_ta_product* s, const ta* t,
const kripke* k, bdd changeset)
: ta_succ_iterator_product(s, t, k)
{
current_condition_ = changeset;
}
void
ta_succ_iterator_product_by_changeset::next_kripke_dest()
{
@ -465,8 +463,5 @@ namespace spot
current_condition_);
ta_succ_it_->first();
}
}
}

10
src/ta/tgta.hh
View file

@ -1,5 +1,5 @@
// Copyright (C) 2010, 2011 Laboratoire de Recherche et Developpement
// de l Epita_explicit (LRDE).
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -18,8 +18,8 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#ifndef SPOT_TA_TGBTA_HH
# define SPOT_TA_TGBTA_HH
#ifndef SPOT_TA_TGTA_HH
# define SPOT_TA_TGTA_HH
#include "tgba/tgba.hh"
@ -82,4 +82,4 @@ namespace spot
}
#endif // SPOT_TA_TGBTA_HH
#endif // SPOT_TA_TGTA_HH

10
src/ta/tgtaproduct.cc
View file

@ -74,8 +74,8 @@ namespace spot
// tgbtgta_succ_iterator_product
tgta_succ_iterator_product::tgta_succ_iterator_product(
const state_product* s, const kripke* k, const tgta* t,
fixed_size_pool* pool) :
source_(s), tgta_(t), kripke_(k), pool_(pool)
fixed_size_pool* pool)
: source_(s), tgta_(t), kripke_(k), pool_(pool)
{
state * tgta_init_state = tgta_->get_init_state();
@ -151,9 +151,9 @@ namespace spot
}
// If one of the two successor sets is empty initially, we reset
// kripke_succ_it_, so that done() can detect this situation easily. (We
// choose to reset kripke_succ_it_ because this variable is already used by
// done().)
// kripke_succ_it_, so that done() can detect this situation
// easily. (We choose to reset kripke_succ_it_ because this
// variable is already used by done().)
if (kripke_succ_it_->done())
{
delete kripke_succ_it_;

16
src/ta/tgtaproduct.hh
View file

@ -1,8 +1,9 @@
// Copyright (C) 2011 Laboratoire de Recherche et Développement
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2012 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
// Université Pierre et Marie Curie.
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
// Université Pierre et Marie Curie.
//
// This file is part of Spot, a model checking library.
//
@ -21,8 +22,8 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#ifndef SPOT_tgta_TGBAPRODUCT_HH
# define SPOT_tgta_TGBAPRODUCT_HH
#ifndef SPOT_TA_TGTAPRODUCT_HH
# define SPOT_TA_TGTAPRODUCT_HH
#include "tgba/tgba.hh"
#include "tgba/tgbaproduct.hh"
@ -54,7 +55,8 @@ namespace spot
class tgta_succ_iterator_product : public tgba_succ_iterator
{
public:
tgta_succ_iterator_product(const state_product* s, const kripke* k, const tgta* tgta, fixed_size_pool* pool);
tgta_succ_iterator_product(const state_product* s, const kripke* k,
const tgta* tgta, fixed_size_pool* pool);
virtual
~tgta_succ_iterator_product();
@ -107,4 +109,4 @@ namespace spot
}
#endif // SPOT_tgta_TGBAPRODUCT_HH
#endif // SPOT_TA_TGTAPRODUCT_HH