- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Put under Git control.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: f841c4199161a865fbbbf1803a0193e9d2772d40 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f841c4199161… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 22:27:53 2014 +0100 Put under Git control. --- src/Handler.cc | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc new file mode 100644 index 0000000..f77b7d9 --- /dev/null +++ b/src/Handler.cc @@ -0,0 +1,31 @@ +/* Handler and derived classes' implementation (non-inline functions). + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL 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. + +The PPL 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, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +#include "ppl-config.h" +#include "Handler_defs.hh" + +namespace PPL = Parma_Polyhedra_Library; + +inline +PPL::Implementation::Watchdog::Handler::~Handler() { +}

1 0

[GIT] ppl/ppl(master): Guarantee that header file names are unique.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 89645ef2d50ea6c7ba965a6b12bca2e7c61bfb24 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=89645ef2d50e… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 21:50:49 2014 +0100 Guarantee that header file names are unique. Fixes violations of rule CP1.PRE08 detected by ECLAIR. --- src/Ask_Tell_inlines.hh | 2 +- src/BD_Shape_inlines.hh | 2 +- src/BD_Shape_templates.hh | 2 +- src/BHRZ03_Certificate.cc | 2 +- src/BHRZ03_Certificate_defs.hh | 2 +- src/Bit_Matrix_inlines.hh | 2 +- src/Bit_Row.cc | 2 +- src/Bit_Row_inlines.hh | 2 +- src/Checked_Number_templates.hh | 2 +- src/Congruence.cc | 2 +- src/Congruence_System.cc | 2 +- src/Constraint_System.cc | 2 +- src/DB_Matrix_inlines.hh | 2 +- src/DB_Row_inlines.hh | 2 +- src/Dense_Row.cc | 2 +- src/Dense_Row_inlines.hh | 2 +- src/Determinate_defs.hh | 2 +- src/Determinate_inlines.hh | 2 +- src/Float_defs.hh | 2 +- src/GMP_Integer_inlines.hh | 2 +- src/Generator_System.cc | 2 +- src/Grid_Certificate.cc | 2 +- src/Grid_Certificate_defs.hh | 2 +- src/Grid_Generator_System.cc | 2 +- src/Grid_Status.cc | 2 +- src/Grid_chdims.cc | 2 +- src/Grid_nonpublic.cc | 2 +- src/Grid_public.cc | 2 +- src/Grid_simplify.cc | 2 +- src/Grid_widenings.cc | 2 +- src/H79_Certificate.cc | 2 +- src/H79_Certificate_defs.hh | 2 +- src/Linear_Expression_Impl.cc | 2 +- src/Makefile.am | 4 ++-- src/OR_Matrix_inlines.hh | 2 +- src/Octagonal_Shape_inlines.hh | 2 +- src/Octagonal_Shape_templates.hh | 2 +- src/Partial_Function_inlines.hh | 2 +- src/Ph_Status.cc | 2 +- src/Poly_Con_Relation.cc | 2 +- src/Poly_Gen_Relation.cc | 2 +- src/Polyhedron_chdims.cc | 2 +- src/Polyhedron_nonpublic.cc | 2 +- src/Polyhedron_public.cc | 2 +- src/Polyhedron_widenings.cc | 2 +- src/Powerset_inlines.hh | 2 +- src/Powerset_templates.hh | 2 +- src/Ptr_Iterator_inlines.hh | 2 +- src/Result_inlines.hh | 2 +- src/Rounding_Dir_inlines.hh | 2 +- src/Swapping_Vector_defs.hh | 2 +- src/Widening_Function_inlines.hh | 2 +- src/algorithms.hh | 2 +- src/{assert.cc => assertions.cc} | 2 +- src/{assert.hh => assertions.hh} | 0 src/c_streambuf.cc | 2 +- src/checked_inlines.hh | 2 +- src/intervals_defs.hh | 2 +- src/math_utilities_inlines.hh | 2 +- src/ppl_header.hh | 2 +- src/stdiobuf.cc | 2 +- src/wrap_assign.hh | 2 +- src/wrap_string.cc | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=89645ef2…

1 0

[GIT] ppl/ppl(master): Provided virtual method anchors.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 0e03920b6f86875c95c084af53ba3ccb32c09e46 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e03920b6f86… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 20:09:22 2014 +0100 Provided virtual method anchors. Fixes violations of rule UCGP1.L4 detected by ECLAIR. --- src/Handler_inlines.hh | 4 ---- src/Makefile.am | 1 + src/PIP_Tree.cc | 3 +++ src/PIP_Tree_inlines.hh | 4 ---- src/c_streambuf.cc | 3 +++ src/c_streambuf_inlines.hh | 4 ---- src/globals.cc | 3 +++ src/globals_inlines.hh | 4 ---- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/Handler_inlines.hh b/src/Handler_inlines.hh index f725463..bd11dfe 100644 --- a/src/Handler_inlines.hh +++ b/src/Handler_inlines.hh @@ -30,10 +30,6 @@ namespace Implementation { namespace Watchdog { -inline -Handler::~Handler() { -} - template <typename Flag_Base, typename Flag> Handler_Flag<Flag_Base, Flag>::Handler_Flag(const Flag_Base* volatile& holder, Flag& flag) diff --git a/src/Makefile.am b/src/Makefile.am index 5e71c5b..f83cd76 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -493,6 +493,7 @@ Generator_System.cc \ Grid_Generator_System.cc \ Generator.cc \ Grid_Generator.cc \ +Handler.cc \ Init.cc \ Coefficient.cc \ Linear_Expression.cc \ diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index fe2318b..90728cb 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -923,6 +923,9 @@ PIP_Tree_Node::PIP_Tree_Node(const PIP_Tree_Node& y) artificial_parameters(y.artificial_parameters) { } +PIP_Tree_Node::~PIP_Tree_Node() { +} + PIP_Tree_Node::Artificial_Parameter ::Artificial_Parameter(const Linear_Expression& expr, Coefficient_traits::const_reference d) diff --git a/src/PIP_Tree_inlines.hh b/src/PIP_Tree_inlines.hh index 3340e64..0d20f24 100644 --- a/src/PIP_Tree_inlines.hh +++ b/src/PIP_Tree_inlines.hh @@ -52,10 +52,6 @@ PIP_Solution_Node::Tableau::denominator() const { return denom; } -inline -PIP_Tree_Node::~PIP_Tree_Node() { -} - inline void PIP_Tree_Node::set_parent(const PIP_Decision_Node* p) { parent_ = p; diff --git a/src/c_streambuf.cc b/src/c_streambuf.cc index 45b8713..a7cf3a6 100644 --- a/src/c_streambuf.cc +++ b/src/c_streambuf.cc @@ -28,6 +28,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +c_streambuf::~c_streambuf() { +} + c_streambuf::int_type c_streambuf::uflow() { const int_type c = underflow(); diff --git a/src/c_streambuf_inlines.hh b/src/c_streambuf_inlines.hh index d1070dc..34d15ae 100644 --- a/src/c_streambuf_inlines.hh +++ b/src/c_streambuf_inlines.hh @@ -31,10 +31,6 @@ c_streambuf::c_streambuf() : unget_char_buf(traits_type::eof()), next_char_buf(traits_type::eof()) { } -inline -c_streambuf::~c_streambuf() { -} - } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_c_streambuf_inlines_hh) diff --git a/src/globals.cc b/src/globals.cc index 042f595..0aa7a31 100644 --- a/src/globals.cc +++ b/src/globals.cc @@ -28,6 +28,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +Throwable::~Throwable() { +} + const Throwable* volatile abandon_expensive_computations = 0; // Initialize Weightwatch_Traits static data members. diff --git a/src/globals_inlines.hh b/src/globals_inlines.hh index 54d83da..8a16862 100644 --- a/src/globals_inlines.hh +++ b/src/globals_inlines.hh @@ -71,10 +71,6 @@ Weightwatch_Traits::from_delta(Threshold& threshold, const Delta& delta) { threshold = weight + delta; } -inline -Throwable::~Throwable() { -} - inline void maybe_abandon() { #ifndef NDEBUG

1 0

[GIT] ppl/ppl(master): Do not use `using namespace std'.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 364ef4de2a7f2f7a7091bc160cf2f043fb6c790b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=364ef4de2a7f… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 18:58:11 2014 +0100 Do not use `using namespace std'. Fixes violations of rule UCGP1.L3 detected by ECLAIR. --- demos/ppl_pips/ppl_pips.cc | 38 +++++++++++++++++++------------------- utils/timings.cc | 10 ++++------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 6731411..e4f56d7 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -118,55 +118,55 @@ pip_display_sol(std::ostream& out, const Parma_Polyhedra_Library::Variables_Set& vars, Parma_Polyhedra_Library::dimension_type space_dimension, int indent = 0) { - using namespace std; using namespace Parma_Polyhedra_Library::IO_Operators; + if (!pip) { - out << setw(indent*2) << "" << "_|_" << endl; + out << std::setw(indent*2) << "" << "_|_" << std::endl; } else { - for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator + for (PPL::PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator i = pip->art_parameter_begin(), i_end = pip->art_parameter_end(); i != i_end; ++i) { - out << setw(indent*2) << "" << "Parameter " - << Linear_Expression(Variable(space_dimension++)) - << " = " << *i << endl; + out << std::setw(indent*2) << "" << "Parameter " + << PPL::Linear_Expression(PPL::Variable(space_dimension++)) + << " = " << *i << std::endl; } - const Constraint_System &constraints = pip->constraints(); + const PPL::Constraint_System& constraints = pip->constraints(); const bool constraints_empty = constraints.empty(); if (!constraints_empty) { - out << setw(indent*2) << "" << "if "; - for (Constraint_System::const_iterator + out << std::setw(indent*2) << "" << "if "; + for (PPL::Constraint_System::const_iterator cs_begin = constraints.begin(), cs_end = constraints.end(), i = cs_begin; i != cs_end; ++i) { out << ((i == cs_begin) ? "" : " and ") << *i; } - out << " then" << endl; + out << " then" << std::endl; } - const PIP_Decision_Node* const decision_node_p = pip->as_decision(); + const PPL::PIP_Decision_Node* const decision_node_p = pip->as_decision(); if (decision_node_p) { pip_display_sol(out, decision_node_p->child_node(true), parameters, vars, space_dimension, indent+1); - out << setw(indent*2) << "" << "else" << endl; + out << std::setw(indent*2) << "" << "else" << std::endl; pip_display_sol(out, decision_node_p->child_node(false), parameters, vars, space_dimension, indent+1); } else { - const PIP_Solution_Node* const solution_node_p = pip->as_solution(); - out << setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; - for (Variables_Set::const_iterator + const PPL::PIP_Solution_Node* const solution_node_p = pip->as_solution(); + out << std::setw(indent*2 + (constraints_empty ? 0 : 2)) << "" << "{"; + for (PPL::Variables_Set::const_iterator v_begin = vars.begin(), v_end = vars.end(), i = v_begin; i != v_end; ++i) { out << ((i == v_begin) ? "" : " ; ") - << solution_node_p->parametric_values(Variable(*i)); + << solution_node_p->parametric_values(PPL::Variable(*i)); } - out << "}" << endl; + out << "}" << std::endl; if (!constraints_empty) { - out << setw(indent*2) << "" << "else" << endl; - out << setw(indent*2 + 2) << "" << "_|_" << endl; + out << std::setw(indent*2) << "" << "else" << std::endl; + out << std::setw(indent*2 + 2) << "" << "_|_" << std::endl; } } } diff --git a/utils/timings.cc b/utils/timings.cc index 7986cdd..b18ea0d 100644 --- a/utils/timings.cc +++ b/utils/timings.cc @@ -41,8 +41,6 @@ site: http://bugseng.com/products/ppl/ . */ # include <sys/resource.h> #endif -using namespace std; - #ifdef PPL_HAVE_TIMEVAL // To save the time when start_clock is called. static struct timeval saved_ru_utime; @@ -53,7 +51,7 @@ start_clock() { #if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage usage; if (getrusage(RUSAGE_SELF, &usage) != 0) { - cerr << "getrusage failed: " << strerror(errno) << endl; + std::cerr << "getrusage failed: " << strerror(errno) << std::endl; exit(1); } else { @@ -63,11 +61,11 @@ start_clock() { } void -print_clock(ostream& s) { +print_clock(std::ostream& s) { #if PPL_HAVE_DECL_GETRUSAGE && defined(PPL_HAVE_TIMEVAL) struct rusage usage; if (getrusage(RUSAGE_SELF, &usage) != 0) { - cerr << "getrusage failed: " << strerror(errno) << endl; + std::cerr << "getrusage failed: " << strerror(errno) << std::endl; exit(1); } else { @@ -96,7 +94,7 @@ print_clock(ostream& s) { } assert(csecs >= 0 && csecs < 100 && secs >= 0); const char fill_char = s.fill(); - s << secs << "." << setfill('0') << setw(2) << csecs; + s << secs << "." << std::setfill('0') << std::setw(2) << csecs; s.fill(fill_char); } #else

1 0

[GIT] ppl/ppl(master): Parenthesis spacing corrected.
by Roberto Bagnara 15 Dec '14

15 Dec '14

Module: ppl/ppl Branch: master Commit: ee1e7ff155068131b1d358c8f4df5c1b05196483 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee1e7ff15506… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Mon Dec 15 19:46:22 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/CO_Tree.cc | 8 ++++---- src/CO_Tree_inlines.hh | 4 ++-- src/CO_Tree_templates.hh | 2 +- src/DB_Row_inlines.hh | 2 +- src/DB_Row_templates.hh | 6 +++--- src/Dense_Row.cc | 20 ++++++++++---------- src/Dense_Row_inlines.hh | 8 ++++---- src/MIP_Problem.cc | 4 ++-- src/checked_inlines.hh | 6 +++--- src/checked_mpq_inlines.hh | 4 ++-- src/checked_mpz_inlines.hh | 6 +++--- 11 files changed, 35 insertions(+), 35 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ee1e7ff1…

1 0

[GIT] ppl/ppl(master): Post-decrement avoided.
by Roberto Bagnara 15 Dec '14

15 Dec '14

Module: ppl/ppl Branch: master Commit: c544c54661e26b466771bc0b4d149bc9ad95e628 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c544c54661e2… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Mon Dec 15 19:41:55 2014 +0100 Post-decrement avoided. Fixes a violation of rule UCGP1.M2 detected by ECLAIR. --- src/Octagonal_Shape_templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Octagonal_Shape_templates.hh b/src/Octagonal_Shape_templates.hh index e250711..c585053 100644 --- a/src/Octagonal_Shape_templates.hh +++ b/src/Octagonal_Shape_templates.hh @@ -7151,7 +7151,7 @@ Octagonal_Shape<T> if (!lhs.all_zeroes(1, j_lhs)) { ++t_lhs; } - j_lhs--; + --j_lhs; } const Coefficient& b_lhs = lhs.inhomogeneous_term();

1 0

[GIT] ppl/ppl(master): Avoid commenting out code.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 26dbe268eb8f85cf9bd651f684f908469f78b0b3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=26dbe268eb8f… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 16:11:44 2014 +0100 Avoid commenting out code. Fixes violations of rule EP1.17 detected by ECLAIR. --- demos/ppl_lcdd/ppl_lcdd.cc | 8 ++++++-- demos/ppl_pips/ppl_pips.cc | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index c38215e..2fb78b2 100755 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -21,8 +21,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -//#define USE_POLKA 1 -//#define USE_POLYLIB 1 +#if 0 +#define USE_POLKA 1 +#endif +#if 0 +#define USE_POLYLIB 1 +#endif #if (!defined(USE_PPL) && !defined(USE_POLKA) && !defined(USE_POLYLIB)) #define USE_PPL 1 diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 1259d80..6731411 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -21,7 +21,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -//#define USE_PIPLIB 1 +#if 0 +#define USE_PIPLIB 1 +#endif #if (!defined(USE_PPL) && !defined(USE_PIPLIB)) #define USE_PPL 1

1 0

[GIT] ppl/ppl(master): Avoid the `expected' identifier.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 36e3ff0ab6e31239d92e90e8fed28a3a674aa199 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=36e3ff0ab6e3… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:59:49 2014 +0100 Avoid the `expected' identifier. The C++ standard, ISO/IEC 14882:2003(E), reserves it for header <exception>. Fixes a violation of rule MP1.17-0-3 detected by ECLAIR. --- src/checked.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 270c598..ac4ac3b 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -161,7 +161,7 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_CVT_STR_UNK; } if (c == 'i' || c == 'I') { - goto inf; + goto infinity; } if (c != '.') { break; @@ -188,7 +188,7 @@ parse_number_part(std::istream& is, number_struct& numer) { goto unexpected_char; } return V_NAN; - inf: + infinity: case 'i': case 'I': if (!is.get(c)) { @@ -287,13 +287,13 @@ parse_number_part(std::istream& is, number_struct& numer) { goto unexpected_char; } if (c == 'e' || c == 'E') { - goto exp; + goto exponent; } if (c == 'p' || c == 'P') { if (numer.base == 16) { numer.base_for_exponent = 2; exponent_offset_scale = 4; - goto exp; + goto exponent; } else { goto unexpected_char; @@ -306,7 +306,7 @@ parse_number_part(std::istream& is, number_struct& numer) { if (c != '^') { goto unexpected_char; } - exp: + exponent: state = EXPONENT; PPL_ASSERT(numer.base >= 2); const long l_max = C_Integer<long>::max;

1 0

[GIT] ppl/ppl(master): Avoid the `unexpected' identifier.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 02d0ea73daf86b970a879e84b16c08a4281842c2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=02d0ea73daf8… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:54:42 2014 +0100 Avoid the `unexpected' identifier. The C++ standard, ISO/IEC 14882:2003(E), reserves it for header <exception>. --- src/Interval_templates.hh | 6 +++--- src/checked.cc | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Interval_templates.hh b/src/Interval_templates.hh index 2c9b0f9..319ced5 100644 --- a/src/Interval_templates.hh +++ b/src/Interval_templates.hh @@ -277,7 +277,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { } } else { - goto unexpected; + goto unexpected_char; } // Get the lower bound. @@ -294,7 +294,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { } } while (is_space(c)); if (c != ',') { - goto unexpected; + goto unexpected_char; } // Get the upper bound. @@ -314,7 +314,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { upper_open = true; } else if (c != ']') { - unexpected: + unexpected_char: is.unget(); fail: is.setstate(std::ios::failbit); diff --git a/src/checked.cc b/src/checked.cc index 45785b8..270c598 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -179,13 +179,13 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_CVT_STR_UNK; } if (c != 'a' && c != 'A') { - goto unexpected; + goto unexpected_char; } if (!is.get(c)) { return V_CVT_STR_UNK; } if (c != 'n' && c != 'N') { - goto unexpected; + goto unexpected_char; } return V_NAN; inf: @@ -195,19 +195,19 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_CVT_STR_UNK; } if (c != 'n' && c != 'n') { - goto unexpected; + goto unexpected_char; } if (!is.get(c)) { return V_CVT_STR_UNK; } if (c != 'f' && c != 'F') { - goto unexpected; + goto unexpected_char; } return numer.neg_mantissa ? V_EQ_MINUS_INFINITY : V_EQ_PLUS_INFINITY; } if (state != FRACTIONAL) { if (get_digit(c, 10) < 0) { - goto unexpected; + goto unexpected_char; } char d; if (c == '0' && !is.get(d).fail()) { @@ -239,18 +239,18 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_CVT_STR_UNK; } if (c != '^') { - goto unexpected; + goto unexpected_char; } numer.base = 0; for (std::string::const_iterator i = numer.mantissa.begin(); i != numer.mantissa.end(); ++i) { numer.base = numer.base * 10 + static_cast<unsigned>(get_digit(*i, 10)); if (numer.base > 36) { - goto unexpected; + goto unexpected_char; } } if (numer.base < 2) { - goto unexpected; + goto unexpected_char; } numer.base_for_exponent = numer.base; numer.mantissa.erase(); @@ -284,7 +284,7 @@ parse_number_part(std::istream& is, number_struct& numer) { } fractional: if (empty_mantissa) { - goto unexpected; + goto unexpected_char; } if (c == 'e' || c == 'E') { goto exp; @@ -296,7 +296,7 @@ parse_number_part(std::istream& is, number_struct& numer) { goto exp; } else { - goto unexpected; + goto unexpected_char; } } if (c == '*') { @@ -304,7 +304,7 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_CVT_STR_UNK; } if (c != '^') { - goto unexpected; + goto unexpected_char; } exp: state = EXPONENT; @@ -338,7 +338,7 @@ parse_number_part(std::istream& is, number_struct& numer) { break; } if (empty_exponent) { - goto unexpected; + goto unexpected_char; } is.unget(); goto ok; @@ -371,7 +371,7 @@ parse_number_part(std::istream& is, number_struct& numer) { return V_EQ; } - unexpected: + unexpected_char: is.unget(); return V_CVT_STR_UNK; }

1 0

[GIT] ppl/ppl(master): Redundant anonymous namespace removed.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: a40962ed0cbaa7c4138b06bf30f15d57743e053a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a40962ed0cba… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:48:42 2014 +0100 Redundant anonymous namespace removed. --- demos/ppl_lcdd/ppl_lcdd.cc | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 5506e1c..c38215e 100755 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -216,7 +216,6 @@ fatal(const char* format, ...) { exit(1); } -namespace { const char* input_file_name = 0; std::istream* input_stream_p = 0; @@ -276,8 +275,6 @@ output() { return *output_stream_p; } -} // namespace - void error(const char* format, ...) { va_list ap;

1 0