December 2014 - PPL-devel - BUGSENG Mailman

[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

[GIT] ppl/ppl(master): Scope of declaration reduced.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 1b911f90de35ceeeae99a184b2c1a1756c4d441c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b911f90de35… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:47:40 2014 +0100 Scope of declaration reduced. Fixes a violation of rule CP1.DCL07 detected by ECLAIR. --- demos/ppl_lcdd/ppl_lcdd.cc | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index d4465b6..5506e1c 100755 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -158,30 +158,35 @@ struct option long_options[] = { }; #endif -static const char* usage_string -= "Usage: %s [OPTION]... [FILE]\n" -"Reads an H-representation (resp., a V-representation) of a polyhedron\n" -"and generates a V-representation (resp., an H-representation) of\n" -"the same polyhedron.\n\n" -"Options:\n" +void +usage(const char* program) { + static const char* usage_string + = "Usage: %s [OPTION]... [FILE]\n" + "Reads an H-representation (resp., a V-representation) of a polyhedron\n" + "and generates a V-representation (resp., an H-representation) of\n" + "the same polyhedron.\n\n" + "Options:\n" #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME -" -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" + " -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) -" -RMB, --max-memory=MB limits memory usage to MB megabytes\n" -" -h, --help prints this help text to stdout\n" -" -oPATH, --output=PATH appends output to PATH\n" -" -t, --timings prints timings to stderr\n" -" -v, --verbose produces lots of output\n" + " -RMB, --max-memory=MB limits memory usage to MB megabytes\n" + " -h, --help prints this help text to stdout\n" + " -oPATH, --output=PATH appends output to PATH\n" + " -t, --timings prints timings to stderr\n" + " -v, --verbose produces lots of output\n" #if defined(USE_PPL) -" -V, --version prints version information to stdout\n" -" -cPATH, --check=PATH checks if the result is equal to what is in PATH\n" + " -V, --version prints version information to stdout\n" + " -cPATH, --check=PATH checks if result is equal to what is in PATH\n" #endif #ifndef PPL_HAVE_GETOPT_H -"\n" -"NOTE: this version does not support long options.\n" + "\n" + "NOTE: this version does not support long options.\n" #endif -"\n" -"Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; + "\n" + "Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; + + fprintf(stdout, usage_string, program); +} #if defined(USE_PPL) #define OPTION_LETTERS "C:R:ho:tvVc:" @@ -402,7 +407,7 @@ process_options(int argc, char* argv[]) { case '?': case 'h': - fprintf(stdout, usage_string, argv[0]); + usage(argv[0]); exit(0); break;

1 0

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

14 Dec '14

Module: ppl/ppl Branch: master Commit: c1b9cd4b8b15570cb79f6ddf65146d0b2b53bfaa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c1b9cd4b8b15… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:38:16 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/BD_Shape_defs.hh | 69 ++++++++++++++++++++------------------ src/Box_defs.hh | 9 +++-- src/Octagonal_Shape_defs.hh | 30 ++++++++++------ src/Pointset_Powerset_inlines.hh | 10 ++--- src/Polyhedron_templates.hh | 8 ++-- 5 files changed, 67 insertions(+), 59 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c1b9cd4b…

1 0

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

14 Dec '14

Module: ppl/ppl Branch: master Commit: 1b0c99aec7406a06ac151eaeaf336c17d57c9cfc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b0c99aec740… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 10:40:35 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/Checked_Number_inlines.hh | 43 ++++++++++++++---------------- src/Float_templates.hh | 2 +- src/Grid_public.cc | 17 ++++++++--- src/Linear_Expression_defs.hh | 41 +++++++++++++++++------------ src/Linear_Expression_inlines.hh | 44 +++++++++++++++++-------------- src/Polyhedron_conversion_templates.hh | 2 +- src/compiler.hh | 2 +- src/intervals_defs.hh | 4 +- 8 files changed, 85 insertions(+), 70 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1b0c99ae…

1 0

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

09 Dec '14

Module: ppl/ppl Branch: master Commit: 4fc56de4298c819b8b157c04e6b85a95830e9470 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4fc56de4298c… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 9 22:49:29 2014 +0100 Post-decrement avoided. Fixes a violation of rule UCGP1.M2 detected by ECLAIR. --- src/Polyhedron_nonpublic.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index 778e46d..e8eec52 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -2428,7 +2428,7 @@ PPL::Polyhedron::positive_time_elapse_assign_impl(const Polyhedron& y) { Generator &g = new_gs.sys.rows[i]; if (g.is_point()) { x_points_gs.insert(g); - num_rows--; + --num_rows; swap(g, new_gs.sys.rows[num_rows]); } }

1 0