diff --git a/ChangeLog b/ChangeLog index bad990033..8ad6551b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-13 Alexandre Duret-Lutz + + * 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 * src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh: diff --git a/iface/gspn/common.cc b/iface/gspn/common.cc index 5a4862967..62302f0ba 100644 --- a/iface/gspn/common.cc +++ b/iface/gspn/common.cc @@ -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 // et Marie Curie. // @@ -26,7 +26,7 @@ namespace spot { 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(); return os; diff --git a/iface/gspn/common.hh b/iface/gspn/common.hh index ea3c582eb..4518dda1e 100644 --- a/iface/gspn/common.hh +++ b/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 // et Marie Curie. // @@ -31,11 +31,11 @@ namespace spot { - /// An exeption used to forward GSPN errors. - class gspn_exeption + /// An exception used to forward GSPN errors. + class gspn_exception { public: - gspn_exeption(const std::string& where, int err) + gspn_exception(const std::string& where, int err) : err_(err), where_(where) { } @@ -57,7 +57,7 @@ namespace spot 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 diff --git a/iface/gspn/dottygspn.cc b/iface/gspn/dottygspn.cc index 208d08e9f..32617a74e 100644 --- a/iface/gspn/dottygspn.cc +++ b/iface/gspn/dottygspn.cc @@ -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 // et Marie Curie. // @@ -49,7 +49,7 @@ main(int argc, char **argv) delete a; delete dict; } - catch (spot::gspn_exeption e) + catch (spot::gspn_exception e) { std::cerr << e << std::endl; throw; diff --git a/iface/gspn/dottyssp.cc b/iface/gspn/dottyssp.cc index d3ac69823..dda7c0e12 100644 --- a/iface/gspn/dottyssp.cc +++ b/iface/gspn/dottyssp.cc @@ -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 // et Marie Curie. // @@ -56,7 +56,7 @@ main(int argc, char **argv) delete control; delete dict; } - catch (spot::gspn_exeption e) + catch (spot::gspn_exception e) { std::cerr << e << std::endl; throw; diff --git a/iface/gspn/gspn.cc b/iface/gspn/gspn.cc index 0a1984803..a1cd53e09 100644 --- a/iface/gspn/gspn.cc +++ b/iface/gspn/gspn.cc @@ -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 // et Marie Curie. // @@ -114,11 +114,11 @@ namespace spot AtomicProp index; int err = prop_index(i->first.c_str(), &index); if (err) - throw gspn_exeption("prop_index(" + i->first + ")", err); + throw gspn_exception("prop_index(" + i->first + ")", err); AtomicPropKind kind; err = prop_kind(index, &kind); 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)); } @@ -201,7 +201,7 @@ namespace spot size_t count = index_count; int res = satisfy(s->get_state(), want, &cube, count); if (res) - throw gspn_exeption("satisfy()", res); + throw gspn_exception("satisfy()", res); assert(cube); last_state_conds_output = bddtrue; for (size_t i = 0; i < count; ++i) @@ -236,7 +236,7 @@ namespace spot { int res = succ(state, &successors_, &size_); if (res) - throw gspn_exeption("succ()", res); + throw gspn_exception("succ()", res); // GreatSPN should return successors_ == 0 and size_ == 0 when a // state has no successors. assert((size_ <= 0) ^ (successors_ != 0)); @@ -377,7 +377,7 @@ namespace spot State s; int err = initial_state(&s); if (err) - throw gspn_exeption("initial_state()", err); + throw gspn_exception("initial_state()", err); return new state_gspn(s); } @@ -436,7 +436,7 @@ namespace spot char* str; int err = print_state(s->get_state(), &str); if (err) - throw gspn_exeption("print_state()", err); + throw gspn_exception("print_state()", err); // Strip trailing \n... unsigned len = strlen(str); while (str[--len] == '\n') @@ -473,14 +473,14 @@ namespace spot { int res = initialize(argc, argv); if (res) - throw gspn_exeption("initialize()", res); + throw gspn_exception("initialize()", res); } gspn_interface::~gspn_interface() { int res = finalize(); if (res) - throw gspn_exeption("finalize()", res); + throw gspn_exception("finalize()", res); } tgba* diff --git a/iface/gspn/ltlgspn.cc b/iface/gspn/ltlgspn.cc index 0464e0309..fe4a6b410 100644 --- a/iface/gspn/ltlgspn.cc +++ b/iface/gspn/ltlgspn.cc @@ -385,7 +385,7 @@ main(int argc, char **argv) delete a_f; delete dict; } - catch (spot::gspn_exeption e) + catch (spot::gspn_exception e) { std::cerr << e << std::endl; throw; diff --git a/iface/gspn/ssp.cc b/iface/gspn/ssp.cc index 5c3d2d288..e902834c7 100644 --- a/iface/gspn/ssp.cc +++ b/iface/gspn/ssp.cc @@ -144,7 +144,7 @@ namespace spot AtomicProp index; int err = prop_index(i->first.c_str(), &index); if (err) - throw gspn_exeption("prop_index(" + i->first + ")", err); + throw gspn_exception("prop_index(" + i->first + ")", err); prop_dict[var] = index; @@ -489,7 +489,7 @@ namespace spot { int err = print_state(gs, &str); if (err) - throw gspn_exeption("print_state()", err); + throw gspn_exception("print_state()", err); // Strip trailing \n... unsigned len = strlen(str); while (str[--len] == '\n') @@ -548,14 +548,14 @@ namespace spot int res = initialize(argc, argv); if (res) - throw gspn_exeption("initialize()", res); + throw gspn_exception("initialize()", res); } gspn_ssp_interface::~gspn_ssp_interface() { int res = finalize(); if (res) - throw gspn_exeption("finalize()", res); + throw gspn_exception("finalize()", res); } tgba*