* iface/gspn/common.hh, iface/gspn/common.cc, iface/gspn/gspn.cc,
iface/gspn/ltlgspn.cc, iface/gspn/dottygspn.cc, iface/gspn/ssp.cc, iface/gspn/dottyssp.cc: s/exeption/exception/g.
This commit is contained in:
parent
983d12cc5a
commit
e84647b30b
8 changed files with 31 additions and 25 deletions
|
|
@ -1,3 +1,9 @@
|
||||||
|
2006-06-13 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
||||||
|
|
||||||
|
* iface/gspn/common.hh, iface/gspn/common.cc, iface/gspn/gspn.cc,
|
||||||
|
iface/gspn/ltlgspn.cc, iface/gspn/dottygspn.cc, iface/gspn/ssp.cc,
|
||||||
|
iface/gspn/dottyssp.cc: s/exeption/exception/g.
|
||||||
|
|
||||||
2006-04-05 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
2006-04-05 Alexandre Duret-Lutz <adl@src.lip6.fr>
|
||||||
|
|
||||||
* src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh:
|
* src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
// Copyright (C) 2003, 2004, 2006 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.
|
// et Marie Curie.
|
||||||
//
|
//
|
||||||
|
|
@ -26,7 +26,7 @@ namespace spot
|
||||||
{
|
{
|
||||||
|
|
||||||
std::ostream&
|
std::ostream&
|
||||||
operator<<(std::ostream& os, const gspn_exeption& e)
|
operator<<(std::ostream& os, const gspn_exception& e)
|
||||||
{
|
{
|
||||||
os << e.get_where() << " exited with " << e.get_err();
|
os << e.get_where() << " exited with " << e.get_err();
|
||||||
return os;
|
return os;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
// Copyright (C) 2003, 2004, 2006 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.
|
// et Marie Curie.
|
||||||
//
|
//
|
||||||
|
|
@ -31,11 +31,11 @@
|
||||||
namespace spot
|
namespace spot
|
||||||
{
|
{
|
||||||
|
|
||||||
/// An exeption used to forward GSPN errors.
|
/// An exception used to forward GSPN errors.
|
||||||
class gspn_exeption
|
class gspn_exception
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
gspn_exeption(const std::string& where, int err)
|
gspn_exception(const std::string& where, int err)
|
||||||
: err_(err), where_(where)
|
: err_(err), where_(where)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -57,7 +57,7 @@ namespace spot
|
||||||
std::string where_;
|
std::string where_;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::ostream& operator<<(std::ostream& os, const gspn_exeption& e);
|
std::ostream& operator<<(std::ostream& os, const gspn_exception& e);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // SPOT_IFACE_GSPN_COMMON_HH
|
#endif // SPOT_IFACE_GSPN_COMMON_HH
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
// Copyright (C) 2003, 2004, 2006 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.
|
// et Marie Curie.
|
||||||
//
|
//
|
||||||
|
|
@ -49,7 +49,7 @@ main(int argc, char **argv)
|
||||||
delete a;
|
delete a;
|
||||||
delete dict;
|
delete dict;
|
||||||
}
|
}
|
||||||
catch (spot::gspn_exeption e)
|
catch (spot::gspn_exception e)
|
||||||
{
|
{
|
||||||
std::cerr << e << std::endl;
|
std::cerr << e << std::endl;
|
||||||
throw;
|
throw;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
// Copyright (C) 2003, 2004, 2006 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.
|
// et Marie Curie.
|
||||||
//
|
//
|
||||||
|
|
@ -56,7 +56,7 @@ main(int argc, char **argv)
|
||||||
delete control;
|
delete control;
|
||||||
delete dict;
|
delete dict;
|
||||||
}
|
}
|
||||||
catch (spot::gspn_exeption e)
|
catch (spot::gspn_exception e)
|
||||||
{
|
{
|
||||||
std::cerr << e << std::endl;
|
std::cerr << e << std::endl;
|
||||||
throw;
|
throw;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
// Copyright (C) 2003, 2004, 2006 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.
|
// et Marie Curie.
|
||||||
//
|
//
|
||||||
|
|
@ -114,11 +114,11 @@ namespace spot
|
||||||
AtomicProp index;
|
AtomicProp index;
|
||||||
int err = prop_index(i->first.c_str(), &index);
|
int err = prop_index(i->first.c_str(), &index);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("prop_index(" + i->first + ")", err);
|
throw gspn_exception("prop_index(" + i->first + ")", err);
|
||||||
AtomicPropKind kind;
|
AtomicPropKind kind;
|
||||||
err = prop_kind(index, &kind);
|
err = prop_kind(index, &kind);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("prop_kind(" + i->first + ")", err);
|
throw gspn_exception("prop_kind(" + i->first + ")", err);
|
||||||
|
|
||||||
prop_dict[index] = ab_pair(kind, bdd_ithvar(var));
|
prop_dict[index] = ab_pair(kind, bdd_ithvar(var));
|
||||||
}
|
}
|
||||||
|
|
@ -201,7 +201,7 @@ namespace spot
|
||||||
size_t count = index_count;
|
size_t count = index_count;
|
||||||
int res = satisfy(s->get_state(), want, &cube, count);
|
int res = satisfy(s->get_state(), want, &cube, count);
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("satisfy()", res);
|
throw gspn_exception("satisfy()", res);
|
||||||
assert(cube);
|
assert(cube);
|
||||||
last_state_conds_output = bddtrue;
|
last_state_conds_output = bddtrue;
|
||||||
for (size_t i = 0; i < count; ++i)
|
for (size_t i = 0; i < count; ++i)
|
||||||
|
|
@ -236,7 +236,7 @@ namespace spot
|
||||||
{
|
{
|
||||||
int res = succ(state, &successors_, &size_);
|
int res = succ(state, &successors_, &size_);
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("succ()", res);
|
throw gspn_exception("succ()", res);
|
||||||
// GreatSPN should return successors_ == 0 and size_ == 0 when a
|
// GreatSPN should return successors_ == 0 and size_ == 0 when a
|
||||||
// state has no successors.
|
// state has no successors.
|
||||||
assert((size_ <= 0) ^ (successors_ != 0));
|
assert((size_ <= 0) ^ (successors_ != 0));
|
||||||
|
|
@ -377,7 +377,7 @@ namespace spot
|
||||||
State s;
|
State s;
|
||||||
int err = initial_state(&s);
|
int err = initial_state(&s);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("initial_state()", err);
|
throw gspn_exception("initial_state()", err);
|
||||||
return new state_gspn(s);
|
return new state_gspn(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -436,7 +436,7 @@ namespace spot
|
||||||
char* str;
|
char* str;
|
||||||
int err = print_state(s->get_state(), &str);
|
int err = print_state(s->get_state(), &str);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("print_state()", err);
|
throw gspn_exception("print_state()", err);
|
||||||
// Strip trailing \n...
|
// Strip trailing \n...
|
||||||
unsigned len = strlen(str);
|
unsigned len = strlen(str);
|
||||||
while (str[--len] == '\n')
|
while (str[--len] == '\n')
|
||||||
|
|
@ -473,14 +473,14 @@ namespace spot
|
||||||
{
|
{
|
||||||
int res = initialize(argc, argv);
|
int res = initialize(argc, argv);
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("initialize()", res);
|
throw gspn_exception("initialize()", res);
|
||||||
}
|
}
|
||||||
|
|
||||||
gspn_interface::~gspn_interface()
|
gspn_interface::~gspn_interface()
|
||||||
{
|
{
|
||||||
int res = finalize();
|
int res = finalize();
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("finalize()", res);
|
throw gspn_exception("finalize()", res);
|
||||||
}
|
}
|
||||||
|
|
||||||
tgba*
|
tgba*
|
||||||
|
|
|
||||||
|
|
@ -385,7 +385,7 @@ main(int argc, char **argv)
|
||||||
delete a_f;
|
delete a_f;
|
||||||
delete dict;
|
delete dict;
|
||||||
}
|
}
|
||||||
catch (spot::gspn_exeption e)
|
catch (spot::gspn_exception e)
|
||||||
{
|
{
|
||||||
std::cerr << e << std::endl;
|
std::cerr << e << std::endl;
|
||||||
throw;
|
throw;
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ namespace spot
|
||||||
AtomicProp index;
|
AtomicProp index;
|
||||||
int err = prop_index(i->first.c_str(), &index);
|
int err = prop_index(i->first.c_str(), &index);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("prop_index(" + i->first + ")", err);
|
throw gspn_exception("prop_index(" + i->first + ")", err);
|
||||||
|
|
||||||
prop_dict[var] = index;
|
prop_dict[var] = index;
|
||||||
|
|
||||||
|
|
@ -489,7 +489,7 @@ namespace spot
|
||||||
{
|
{
|
||||||
int err = print_state(gs, &str);
|
int err = print_state(gs, &str);
|
||||||
if (err)
|
if (err)
|
||||||
throw gspn_exeption("print_state()", err);
|
throw gspn_exception("print_state()", err);
|
||||||
// Strip trailing \n...
|
// Strip trailing \n...
|
||||||
unsigned len = strlen(str);
|
unsigned len = strlen(str);
|
||||||
while (str[--len] == '\n')
|
while (str[--len] == '\n')
|
||||||
|
|
@ -548,14 +548,14 @@ namespace spot
|
||||||
|
|
||||||
int res = initialize(argc, argv);
|
int res = initialize(argc, argv);
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("initialize()", res);
|
throw gspn_exception("initialize()", res);
|
||||||
}
|
}
|
||||||
|
|
||||||
gspn_ssp_interface::~gspn_ssp_interface()
|
gspn_ssp_interface::~gspn_ssp_interface()
|
||||||
{
|
{
|
||||||
int res = finalize();
|
int res = finalize();
|
||||||
if (res)
|
if (res)
|
||||||
throw gspn_exeption("finalize()", res);
|
throw gspn_exception("finalize()", res);
|
||||||
}
|
}
|
||||||
|
|
||||||
tgba*
|
tgba*
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue