November 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Code layout improved.
by Roberto Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 9ff6b157a31abe322be8f0ab89f993dbfff1521c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ff6b157a31a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 3 20:38:31 2011 +0100 Code layout improved. --- src/Float.templates.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Float.templates.hh b/src/Float.templates.hh index 28147bf..c470ea6 100644 --- a/src/Float.templates.hh +++ b/src/Float.templates.hh @@ -158,8 +158,8 @@ void upper_bound_assign(std::map<dimension_type, typename FP_Linear_Form_Abstract_Store::iterator i1_end = ls1.end(); typename FP_Linear_Form_Abstract_Store::const_iterator i2_end = ls2.end(); while (i1 != i1_end) { - typename FP_Linear_Form_Abstract_Store::const_iterator i2 = - ls2.find(i1->first); + typename FP_Linear_Form_Abstract_Store::const_iterator + i2 = ls2.find(i1->first); if ((i2 == i2_end) || (i1->second != i2->second)) ls1.erase(i1++); else

1 0

[GIT] ppl/ppl(master): Simplified implementation.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: efed831cda3f447da48885d3a3f52282d5abc4a4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=efed831cda3f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 19:57:23 2011 +0100 Simplified implementation. --- src/math_utilities.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/math_utilities.inlines.hh b/src/math_utilities.inlines.hh index 550156c..db38860 100644 --- a/src/math_utilities.inlines.hh +++ b/src/math_utilities.inlines.hh @@ -44,7 +44,7 @@ template <typename T> inline T low_bits_mask(const unsigned n) { PPL_ASSERT(n < unsigned(std::numeric_limits<T>::digits)); - return (n == 0) ? 0 : ~(~(T(0u)) << n); + return ~((~static_cast<T>(0)) << n); } template <typename T>

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 9954d6d0b6f5a88175c0f00eb0aae767d862dc4b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9954d6d0b6f5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:33:35 2011 +0100 Avoid implicit conversions reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/checked_int.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index 10ab8da..c45f306 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -662,14 +662,14 @@ assign_unsigned_int_mpz(To& to, const mpz_class& from, Rounding_Dir dir) { return set_neg_overflow_int<To_Policy>(to, dir); if (sizeof(To) <= sizeof(unsigned long)) { if (!To_Policy::check_overflow) { - to = from.get_ui(); + to = static_cast<To>(from.get_ui()); return V_EQ; } if (from.fits_ulong_p()) { unsigned long v = from.get_ui(); if (PPL_GT_SILENT(v, (Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); - to = v; + to = static_cast<To>(v); return V_EQ; } }

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: ba6a021a1ac94a6d97e6600e1bc4e710861160d3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba6a021a1ac9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:32:14 2011 +0100 Avoid implicit conversion reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 3d2a386..4b4fa1e 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -313,7 +313,7 @@ PPL::Bit_Row::union_helper(const Bit_Row& y, const Bit_Row& z) { mp_size_t z_size = z.vec->_mp_size; PPL_ASSERT(y_size <= z_size); PPL_ASSERT(vec->_mp_alloc >= z_size); - vec->_mp_size = z_size; + vec->_mp_size = z.vec->_mp_size; mp_srcptr yp = y.vec->_mp_d; mp_srcptr zp = z.vec->_mp_d; mp_ptr p = vec->_mp_d;

1 0

[GIT] ppl/ppl(master): Removed redundant cast.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 1d68cfff17ee1fd649a2a012b6352f6d9b944280 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1d68cfff17ee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:06:57 2011 +0100 Removed redundant cast. Detected by ECLAIR service castexpr. --- src/meta_programming.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/meta_programming.hh b/src/meta_programming.hh index 2e19d84..efffa29 100644 --- a/src/meta_programming.hh +++ b/src/meta_programming.hh @@ -120,8 +120,7 @@ struct Compile_Time_Check<true> { enum anonymous_enum_compile_time_check_ ## suffix { \ /* If e evaluates to false, then the sizeof cannot be compiled. */ \ PPL_COMPILE_TIME_CHECK_NAME(suffix) \ - = sizeof(Parma_Polyhedra_Library:: \ - Compile_Time_Check<static_cast<bool>(e)>) \ + = sizeof(Parma_Polyhedra_Library::Compile_Time_Check<e>) \ } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(master): Removed several redundant casts.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 52514333875c79ba71b0f40559c79b0430a61eaa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52514333875c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 19:06:03 2011 +0100 Removed several redundant casts. Detected by ECLAIR service castexpr. --- src/checked.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 8d4ac29..e886489 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -210,7 +210,7 @@ parse_number_part(std::istream& is, number_struct& num) { case BASE: if (get_digit(c, 10) >= 0) { if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; } @@ -238,7 +238,7 @@ parse_number_part(std::istream& is, number_struct& num) { case INTEGER: if (get_digit(c, num.base) >= 0) { if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; } @@ -252,7 +252,7 @@ parse_number_part(std::istream& is, number_struct& num) { if (get_digit(c, num.base) >= 0) { --exponent_offset; if (c != '0' || !num.mantissa.empty()) - num.mantissa += (char) c; + num.mantissa += c; empty_mantissa = false; break; }

1 0

[GIT] ppl/ppl(master): Removed a few redundant casts.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 2ef798d06d7cd127971bcdbf4c7ce2ca90cece65 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ef798d06d7c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 17:55:05 2011 +0100 Removed a few redundant casts. Detected by ECLAIR service castexpr. --- src/Grid_Generator_System.cc | 5 +++-- src/Grid_nonpublic.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Grid_Generator_System.cc b/src/Grid_Generator_System.cc index 9945b63..0f1aed9 100644 --- a/src/Grid_Generator_System.cc +++ b/src/Grid_Generator_System.cc @@ -319,9 +319,10 @@ PPL::Grid_Generator_System // Swap the parameter divisor column into the new last column. swap_columns(col, col + dims); // Set the diagonal element of each added rows. - dimension_type num_rows = this->num_rows(); + Grid_Generator_System& x = *this; + const dimension_type num_rows = x.num_rows(); for (dimension_type row = num_rows - dims; row < num_rows; ++row, ++col) - const_cast<Coefficient&>((*this)[row][col]) = 1; + x[row][col] = 1; } void diff --git a/src/Grid_nonpublic.cc b/src/Grid_nonpublic.cc index b00088d..39c09ee 100644 --- a/src/Grid_nonpublic.cc +++ b/src/Grid_nonpublic.cc @@ -62,7 +62,7 @@ PPL::Grid::construct(dimension_type num_dimensions, // dimension and then store it in `con_sys'. Congruence_System cgs(Congruence::zero_dim_false()); cgs.increase_space_dimension(space_dim); - const_cast<Congruence_System&>(con_sys).swap(cgs); + con_sys.swap(cgs); PPL_ASSERT(OK()); return; @@ -456,7 +456,7 @@ PPL::Grid::set_empty() { // dimension and then swap it with `con_sys'. Congruence_System cgs(Congruence::zero_dim_false()); cgs.increase_space_dimension(space_dim); - const_cast<Congruence_System&>(con_sys).swap(cgs); + con_sys.swap(cgs); } void

1 0

[GIT] ppl/ppl(master): Use consistently get_digit.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 3082a84e1fdbfad1cc17280aa047bfaff8ea0130 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3082a84e1fdb… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 16:26:45 2011 +0100 Use consistently get_digit. --- src/checked.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index d1a8aed..8d4ac29 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -222,7 +222,7 @@ parse_number_part(std::istream& is, number_struct& num) { std::string::const_iterator i; num.base = 0; for (i = num.mantissa.begin(); i != num.mantissa.end(); i++) { - num.base = num.base * 10 + (*i - '0'); + num.base = num.base * 10 + get_digit(*i, 10); if (num.base > 36) goto unexpected; }

1 0

[GIT] ppl/ppl(master): Fixed bool vs. numeric unsafe mixing.
by Abramo Bagnara 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: 7f72ff168aa3989740f248c1fbe636f01157a9e6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7f72ff168aa3… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Nov 3 16:13:06 2011 +0100 Fixed bool vs. numeric unsafe mixing. Detected by ECLAIR service utypflag. --- src/checked_float.inlines.hh | 6 +++--- src/fpu-c99.inlines.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 5f91f67..c6ed19a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -801,12 +801,12 @@ set_pos_overflow_float(T& to, Rounding_Dir dir) { template <typename To_Policy, typename From_Policy, typename T> inline Result assign_float_mpz(T& to, const mpz_class& from, Rounding_Dir dir) { - mpz_srcptr from_z = from.get_mpz_t(); - int sign = mpz_sgn(from_z); + int sign = sgn(from); if (sign == 0) { to = 0; return V_EQ; } + mpz_srcptr from_z = from.get_mpz_t(); size_t exponent = mpz_sizeinbase(from_z, 2) - 1; if (exponent > size_t(Float<T>::Binary::EXPONENT_MAX)) { if (sign < 0) @@ -846,7 +846,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { return assign_float_mpz<To_Policy, From_Policy>(to, num, dir); mpz_srcptr num_z = num.get_mpz_t(); mpz_srcptr den_z = den.get_mpz_t(); - int sign = mpz_sgn(num_z); + int sign = sgn(num); signed long exponent = mpz_sizeinbase(num_z, 2) - mpz_sizeinbase(den_z, 2); if (exponent < Float<T>::Binary::EXPONENT_MIN_DENORM) { to = 0; diff --git a/src/fpu-c99.inlines.hh b/src/fpu-c99.inlines.hh index 7fc12de..cda7a4c 100644 --- a/src/fpu-c99.inlines.hh +++ b/src/fpu-c99.inlines.hh @@ -87,7 +87,7 @@ fpu_restore_rounding_direction(fpu_rounding_control_word_type w) { inline int fpu_check_inexact() { #if PPL_CXX_SUPPORTS_IEEE_INEXACT_FLAG - return fetestexcept(FE_INEXACT) != 0; + return fetestexcept(FE_INEXACT) != 0 ? 1 : 0; #else return -1; #endif

1 0

[GIT] ppl/ppl(master): Avoid implicit integral conversion reducing size of underlying type.
by Enea Zaffanella 03 Nov '11

03 Nov '11

Module: ppl/ppl Branch: master Commit: ad542abaf25726e348754a9fb139074f6df9f81b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ad542abaf257… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 3 15:19:21 2011 +0100 Avoid implicit integral conversion reducing size of underlying type. Detected by ECLAIR service utypflag. --- src/checked.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index ed71a67..d1a8aed 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -278,7 +278,7 @@ parse_number_part(std::istream& is, number_struct& num) { exp: state = EXPONENT; max_exp_div = LONG_MAX / num.base; - max_exp_rem = LONG_MAX % num.base; + max_exp_rem = static_cast<int>(LONG_MAX % num.base); if (!is.get(c)) return V_CVT_STR_UNK; if (c == '-') {

1 0