February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 279f44d4d2ad2e818be866ff37b79336ab0333e7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=279f44d4d2ad… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 10:47:58 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.inlines.hh | 10 +++++----- src/Float.defs.hh | 2 +- src/Row_Flags.defs.hh | 2 +- src/checked.cc | 20 +++++++++++--------- src/checked_float.inlines.hh | 10 +++++----- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index da1824e..46a1236 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -58,13 +58,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { if (y_size < z_size) { PPL_ASSERT(static_cast<unsigned long>(z_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_init2(vec, z_size * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<mp_bitcnt_t>(z_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, z); } else { PPL_ASSERT(static_cast<unsigned long>(y_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_init2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -119,7 +119,7 @@ Bit_Row::clear() { inline memory_size_type Bit_Row::external_memory_in_bytes() const { - return vec[0]._mp_alloc * PPL_SIZEOF_MP_LIMB_T; + return static_cast<memory_size_type>(vec[0]._mp_alloc) * PPL_SIZEOF_MP_LIMB_T; } inline memory_size_type @@ -136,13 +136,13 @@ Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { if (x_size < y_size) { PPL_ASSERT(static_cast<unsigned long>(y_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(vec, y_size * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(x, y); } else { PPL_ASSERT(static_cast<unsigned long>(x_size) <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); - mpz_realloc2(vec, x_size * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<mp_bitcnt_t>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); } } diff --git a/src/Float.defs.hh b/src/Float.defs.hh index fa60ff0..e2f0a44 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -263,7 +263,7 @@ struct float_ieee754_quad { static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 112; - static const int EXPONENT_MAX = (1U << (EXPONENT_BITS - 1)) - 1; + static const int EXPONENT_MAX = (1 << (EXPONENT_BITS - 1)) - 1; static const int EXPONENT_BIAS = EXPONENT_MAX; static const int EXPONENT_MIN = -EXPONENT_MAX + 1; static const int EXPONENT_MIN_DENORM = EXPONENT_MIN diff --git a/src/Row_Flags.defs.hh b/src/Row_Flags.defs.hh index bf8e013..cfff314 100644 --- a/src/Row_Flags.defs.hh +++ b/src/Row_Flags.defs.hh @@ -67,7 +67,7 @@ protected: static const unsigned first_free_bit = 0; //! Total number of bits that can be stored. - static const unsigned num_bits = std::numeric_limits<base_type>::digits; + static const unsigned num_bits = sizeof_to_bits(sizeof(base_type)); //! Constructs an object with flags set as in \p n. explicit Row_Flags(base_type n); diff --git a/src/checked.cc b/src/checked.cc index b024861..12a725e 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -51,8 +51,8 @@ struct number_struct { association; returns \f$-1\f$ otherwise. */ inline int -get_digit(char c, int base = 10) { - int n; +get_digit(char c, unsigned int base = 10) { + unsigned int n; switch (c) { case '0': n = 0; break; case '1': n = 1; break; @@ -95,7 +95,7 @@ get_digit(char c, int base = 10) { } if (n >= base) return -1; - return n; + return static_cast<int>(n); } /*! \brief @@ -136,7 +136,7 @@ parse_number_part(std::istream& is, number_struct& numer) { bool empty_exponent = true; bool empty_mantissa = true; long exponent_offset = 0; - long exponent_offset_scale = 1; + unsigned exponent_offset_scale = 1; numer.base = 10; numer.base_for_exponent = 10; numer.neg_mantissa = false; @@ -223,7 +223,7 @@ parse_number_part(std::istream& is, number_struct& numer) { for (std::string::const_iterator i = numer.mantissa.begin(); i != numer.mantissa.end(); i++) { - numer.base = numer.base * 10 + get_digit(*i, 10); + numer.base = numer.base * 10 + static_cast<unsigned>(get_digit(*i, 10)); if (numer.base > 36) goto unexpected; } @@ -301,7 +301,7 @@ parse_number_part(std::istream& is, number_struct& numer) { if (numer.exponent > max_exp_div || (numer.exponent == max_exp_div && d > max_exp_rem)) return V_CVT_STR_UNK; - numer.exponent = 10*numer.exponent + d; + numer.exponent = 10 * numer.exponent + static_cast<unsigned int>(d); break; } if (empty_exponent) @@ -331,7 +331,7 @@ parse_number_part(std::istream& is, number_struct& numer) { else neg = false; sum_sign(numer.neg_exponent, numer.exponent, - neg, exponent_offset * exponent_offset_scale); + neg, static_cast<unsigned long>(exponent_offset) * exponent_offset_scale); return V_EQ; } @@ -405,11 +405,13 @@ input_mpq(mpq_class& to, std::istream& is) { } mpz_ptr numer = to.get_num().get_mpz_t(); mpz_ptr denom = to.get_den().get_mpz_t(); - mpz_set_str(numer, numer_struct.mantissa.c_str(), numer_struct.base); + mpz_set_str(numer, numer_struct.mantissa.c_str(), + static_cast<int>(numer_struct.base)); if (denom_struct.base != 0) { if (numer_struct.neg_mantissa != denom_struct.neg_mantissa) mpz_neg(numer, numer); - mpz_set_str(denom, denom_struct.mantissa.c_str(), denom_struct.base); + mpz_set_str(denom, denom_struct.mantissa.c_str(), + static_cast<int>(denom_struct.base)); if (numer_struct.exponent != 0 || denom_struct.exponent != 0) { // Multiply the exponents into the numerator and denominator. mpz_t z; diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 44679e6..029bc6e 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -862,8 +862,8 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { mpz_srcptr numer_z = numer.get_mpz_t(); mpz_srcptr denom_z = denom.get_mpz_t(); int sign = sgn(numer); - signed long exponent - = mpz_sizeinbase(numer_z, 2) - mpz_sizeinbase(denom_z, 2); + long exponent = static_cast<long>(mpz_sizeinbase(numer_z, 2)) + - static_cast<long>(mpz_sizeinbase(denom_z, 2)); if (exponent < Float<T>::Binary::EXPONENT_MIN_DENORM) { to = 0; inexact: @@ -884,13 +884,13 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { needed_bits -= Float<T>::Binary::EXPONENT_MIN - exponent; mpz_t mantissa; mpz_init(mantissa); - signed long shift = needed_bits - exponent; + long shift = static_cast<long>(needed_bits) - exponent; if (shift > 0) { - mpz_mul_2exp(mantissa, numer_z, shift); + mpz_mul_2exp(mantissa, numer_z, static_cast<mp_bitcnt_t>(shift)); numer_z = mantissa; } else if (shift < 0) { - mpz_mul_2exp(mantissa, denom_z, -shift); + mpz_mul_2exp(mantissa, denom_z, static_cast<mp_bitcnt_t>(-shift)); denom_z = mantissa; } mpz_t r;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Abramo Bagnara 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: b9259e66b7b7fa5a536497b66baf3fcee31b2cdb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b9259e66b7b7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Feb 22 23:54:30 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 8 ++-- src/Bit_Row.inlines.hh | 2 +- src/CO_Tree.cc | 14 ++++----- src/CO_Tree.defs.hh | 2 +- src/CO_Tree.templates.hh | 7 ++-- src/Float.defs.hh | 68 +++++++++++++++++++++--------------------- src/Float.inlines.hh | 12 ++++---- src/Float.templates.hh | 3 +- src/checked_float.inlines.hh | 14 ++++---- src/checked_int.inlines.hh | 38 ++++++++++++------------ src/compiler.hh | 5 +-- src/globals.inlines.hh | 3 +- 12 files changed, 86 insertions(+), 90 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b9259e66…

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions changing integer type signedness.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 9afcaffceb21f412fe286e06bb438a8cc78b7dd6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9afcaffceb21… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 21:48:20 2012 +0100 Avoid implicit conversions changing integer type signedness. Detected by ECLAIR service utypflag. --- src/CO_Tree.cc | 13 ++++++++----- src/CO_Tree.inlines.hh | 5 +++-- src/CO_Tree.templates.hh | 5 +++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 94cd7f5..45913e0 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -893,7 +893,8 @@ PPL::CO_Tree --subtree_size; } - return first_unused_index - indexes; + PPL_ASSERT(first_unused_index >= indexes); + return static_cast<dimension_type>(first_unused_index - indexes); } void @@ -911,8 +912,9 @@ PPL::CO_Tree::redistribute_elements_in_subtree( // For each node level, the stack may contain up to two element (one for the // subtree rooted at the right son of a node of that level, and one for the // node itself). An additional element can be at the top of the tree. - static std::pair<dimension_type,dimension_type> - stack[2*CHAR_BIT*sizeof(dimension_type)+1]; + static const unsigned stack_size + = 2U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type) + 1U; + static std::pair<dimension_type,dimension_type> stack[stack_size]; std::pair<dimension_type,dimension_type>* stack_first_empty = stack; @@ -1003,8 +1005,9 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type, signed char> - stack[5*CHAR_BIT*sizeof(dimension_type)]; + static const unsigned stack_size + = 5U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type); + static std::pair<dimension_type, signed char> stack[stack_size]; dimension_type stack_first_empty = 0; diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 50a03e7..48b76fc 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -761,7 +761,8 @@ CO_Tree::tree_iterator::follow_left_children_with_value() { p -= (offset - 1); while (*p == unused_index) ++p; - i = p - tree.indexes; + PPL_ASSERT(p >= tree.indexes); + i = static_cast<dimension_type>(p - tree.indexes); offset = i & -i; PPL_ASSERT(OK()); } @@ -774,7 +775,7 @@ CO_Tree::tree_iterator::follow_right_children_with_value() { p += (offset - 1); while (*p == unused_index) --p; - i = p - tree.indexes; + i = static_cast<dimension_type>(p - tree.indexes); offset = i & -i; PPL_ASSERT(OK()); } diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 488f541..7c8e5ac 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -53,8 +53,9 @@ CO_Tree::CO_Tree(Iterator i, dimension_type n) { // with operation 0, one element with operation 2 and one element // with operation 3. An additional element with operation 1 can be at the // top of the tree. - static std::pair<dimension_type, signed char> - stack[4*CHAR_BIT*sizeof(dimension_type)+1]; + static const unsigned stack_size + = 4U * static_cast<unsigned>(CHAR_BIT) * sizeof(dimension_type) + 1U; + static std::pair<dimension_type, signed char> stack[stack_size]; dimension_type stack_first_empty = 0;

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing type signedness.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 6854dc3b05c23b4a4c465980a2fb9be1c077df18 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6854dc3b05c2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 21:05:33 2012 +0100 Avoid implicit conversion changing type signedness. Detected by ECLAIR service utypflag. --- src/Linear_Row.inlines.hh | 2 +- src/Linear_System.cc | 10 +++++++--- src/Linear_System.inlines.hh | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Linear_Row.inlines.hh b/src/Linear_Row.inlines.hh index 571a7e3..b690b00 100644 --- a/src/Linear_Row.inlines.hh +++ b/src/Linear_Row.inlines.hh @@ -158,7 +158,7 @@ Linear_Row::space_dimension() const { const dimension_type sz = size(); return (sz == 0) ? 0 - : (sz - (is_necessarily_closed() ? 1 : 2)); + : (sz - (is_necessarily_closed() ? 1U : 2U)); } inline diff --git a/src/Linear_System.cc b/src/Linear_System.cc index 9d7255c..506b507 100644 --- a/src/Linear_System.cc +++ b/src/Linear_System.cc @@ -520,13 +520,17 @@ PPL::Linear_System::sort_and_remove_with_sat(Bit_Matrix& sat) { // First, sort `sys' (keeping `sat' consistent) without removing duplicates. With_Bit_Matrix_iterator first(sys.rows.begin(), sat.rows.begin()); - With_Bit_Matrix_iterator last = first + sat.num_rows(); + typedef With_Bit_Matrix_iterator::difference_type diff_type; + With_Bit_Matrix_iterator last + = first + static_cast<diff_type>(sat.num_rows()); Implementation::swapping_sort(first, last, Row_Less_Than()); // Second, move duplicates in `sys' to the end (keeping `sat' consistent). With_Bit_Matrix_iterator new_last = Implementation::swapping_unique(first, last); - const dimension_type num_duplicates = last - new_last; + const diff_type dist = last - new_last; + PPL_ASSERT(dist >= 0); + const dimension_type num_duplicates = static_cast<dimension_type>(dist); const dimension_type new_first_pending_row = sys.first_pending_row() - num_duplicates; @@ -879,7 +883,7 @@ PPL::Linear_System::OK(const bool check_strong_normalized) const { // A non-empty system will contain constraints or generators; in // both cases it must have at least one column for the inhomogeneous // term and, if it is NNC, another one for the epsilon coefficient. - const dimension_type min_cols = is_necessarily_closed() ? 1 : 2; + const dimension_type min_cols = is_necessarily_closed() ? 1U : 2U; if (num_columns() < min_cols) { #ifndef NDEBUG cerr << "Linear_System has fewer columns than the minimum " diff --git a/src/Linear_System.inlines.hh b/src/Linear_System.inlines.hh index b8d999c..9ed4694 100644 --- a/src/Linear_System.inlines.hh +++ b/src/Linear_System.inlines.hh @@ -204,7 +204,7 @@ Linear_System::space_dimension() const { const dimension_type n_columns = num_columns(); return (n_columns == 0) ? 0 - : (n_columns - (is_necessarily_closed() ? 1 : 2)); + : (n_columns - (is_necessarily_closed() ? 1U : 2U)); } inline void

1 0

[GIT] ppl/ppl(master): Added helper function check_space_dimension_overflow ().
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 800d387ce5e288bfe7bda719e018986715d10490 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=800d387ce5e2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 19:36:39 2012 +0100 Added helper function check_space_dimension_overflow(). Added similar helper in class Polyhedron and got rid of no longer needed method throw_space_dimension_overflow(). Exploit the new helper to simplify space dim checking in constructors. --- src/Box.defs.hh | 3 - src/Box.templates.hh | 134 ++++++++++++++++++++++------------------- src/C_Polyhedron.cc | 40 ++++++------- src/C_Polyhedron.inlines.hh | 98 +++++++++++++----------------- src/Grid.defs.hh | 5 -- src/Grid.inlines.hh | 96 +++++++++++++++-------------- src/Grid.templates.hh | 17 +++--- src/Grid_Generator.cc | 2 +- src/Grid_chdims.cc | 37 +++++++----- src/Grid_nonpublic.cc | 9 --- src/Grid_public.cc | 43 +++++++------ src/NNC_Polyhedron.cc | 40 ++++++------- src/NNC_Polyhedron.inlines.hh | 98 +++++++++++++----------------- src/Polyhedron.defs.hh | 19 ++++-- src/Polyhedron.templates.hh | 12 ++++ src/Polyhedron_chdims.cc | 41 +++++++------ src/Polyhedron_nonpublic.cc | 27 +++++---- src/globals.cc | 16 +++++ src/globals.defs.hh | 7 ++ 19 files changed, 380 insertions(+), 364 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=800d387c…

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: cd4283d7be860b9a4222c3d1a589680bf5847d37 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cd4283d7be86… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 17:55:58 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/Generator.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Generator.cc b/src/Generator.cc index 493bc48..8988b1d 100644 --- a/src/Generator.cc +++ b/src/Generator.cc @@ -320,7 +320,7 @@ PPL::Generator::OK() const { return false; // Topology consistency check. - const dimension_type min_size = is_necessarily_closed() ? 1 : 2; + const dimension_type min_size = is_necessarily_closed() ? 1U : 2U; if (size() < min_size) { #ifndef NDEBUG std::cerr << "Generator has fewer coefficients than the minimum "

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 22 Feb '12

22 Feb '12

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7d915b5e2c1… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 16:24:23 2012 +0100 Macro PPL_ASSERT is not available in compiler.hh. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f27f93acfbf3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 16:23:18 2012 +0100 Let `indent' have type signed int, matching signature of std::setw(). Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7693be2e393… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 16:22:07 2012 +0100 Fixed inclusion directive. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3507a9471ca5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 16:21:22 2012 +0100 Avoid implicit conversions changing signedness. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=75cfbc2340b8… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 15:28:44 2012 +0100 Prefer using C_Integer traits rather than <climits> macros, thereby avoiding implicit conversions changing signedness. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b09c76dc54fe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 15:25:44 2012 +0100 Let `indent_level' have type signed int, matching signature of std::setw(). Detected by ECLAIR service utypflag.

1 0

[GIT] ppl/ppl(master): Avoid using functional casts.
by Patricia Hill 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 418c4e60b06c8668bda97d9ba0fddbbcc49ef213 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=418c4e60b06c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Feb 22 13:57:57 2012 +0000 Avoid using functional casts. Detected by ECLAIR service castexpr. --- src/checked_int.inlines.hh | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index c8e3c3a..5a1b802 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -358,10 +358,12 @@ assign_signed_int_signed_int(To& to, const From from, Rounding_Dir dir) { && (Extended_Int<To_Policy, To>::min > Extended_Int<From_Policy, From>::min || Extended_Int<To_Policy, To>::max < Extended_Int<From_Policy, From>::max))) { if (CHECK_P(To_Policy::check_overflow, - PPL_LT_SILENT(from, From(Extended_Int<To_Policy, To>::min)))) + PPL_LT_SILENT(from, + static_cast<From>(Extended_Int<To_Policy, To>::min)))) return set_neg_overflow_int<To_Policy>(to, dir); if (CHECK_P(To_Policy::check_overflow, - PPL_GT_SILENT(from, From(Extended_Int<To_Policy, To>::max)))) + PPL_GT_SILENT(from, + static_cast<From>(Extended_Int<To_Policy, To>::max)))) return set_pos_overflow_int<To_Policy>(to, dir); } to = static_cast<To>(from); @@ -373,7 +375,7 @@ inline Result assign_signed_int_unsigned_int(To& to, const From from, Rounding_Dir dir) { if (sizeof(To) <= sizeof(From)) { if (CHECK_P(To_Policy::check_overflow, - from > From(Extended_Int<To_Policy, To>::max))) + from > static_cast<From>(Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); } to = static_cast<To>(from); @@ -387,7 +389,7 @@ assign_unsigned_int_signed_int(To& to, const From from, Rounding_Dir dir) { return set_neg_overflow_int<To_Policy>(to, dir); if (sizeof(To) < sizeof(From)) { if (CHECK_P(To_Policy::check_overflow, - from > From(Extended_Int<To_Policy, To>::max))) + from > static_cast<From>(Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); } to = static_cast<To>(from); @@ -401,7 +403,8 @@ assign_unsigned_int_unsigned_int(To& to, const From from, Rounding_Dir dir) { || (sizeof(To) == sizeof(From) && Extended_Int<To_Policy, To>::max < Extended_Int<From_Policy, From>::max)) { if (CHECK_P(To_Policy::check_overflow, - PPL_GT_SILENT(from, From(Extended_Int<To_Policy, To>::max)))) + PPL_GT_SILENT(from, + static_cast<From>(Extended_Int<To_Policy, To>::max)))) return set_pos_overflow_int<To_Policy>(to, dir); } to = static_cast<To>(from);

1 0

[GIT] ppl/ppl(master): Replaced all c-style casts.
by Patricia Hill 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: a6de4769641faef9750c18f8b69ec884815101e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a6de4769641f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Feb 22 13:03:42 2012 +0000 Replaced all c-style casts. Detected by ECLAIR service castexpr. --- src/Bit_Row.cc | 4 ++-- src/CO_Tree.cc | 7 ++++--- src/CO_Tree.templates.hh | 2 +- src/Float.defs.hh | 18 +++++++++--------- src/Float.inlines.hh | 8 ++++---- src/Interval.defs.hh | 2 +- src/checked_mpq.inlines.hh | 2 +- src/checked_mpz.inlines.hh | 2 +- src/intervals.defs.hh | 11 +++++++---- 9 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index ac56da2..d1e1256 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -63,7 +63,7 @@ PPL::Bit_Row::next(unsigned long position) const { // Mask off any bits before `position' in the first limb. mp_limb_t limb - = *p & ((~(mp_limb_t) 0) << (position % PPL_BITS_PER_GMP_LIMB)); + = *p & ((~static_cast<mp_limb_t>(0)) << (position % PPL_BITS_PER_GMP_LIMB)); while (true) { if (limb != 0) @@ -112,7 +112,7 @@ PPL::Bit_Row::prev(unsigned long position) const { } else { const mp_limb_t mask - = (~(mp_limb_t) 0) + = (~static_cast<mp_limb_t>(0)) >> (PPL_BITS_PER_GMP_LIMB - 1 - position % PPL_BITS_PER_GMP_LIMB); p += li; limb = *p & mask; diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 1c4cc88..94cd7f5 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -518,7 +518,7 @@ PPL::CO_Tree::init(dimension_type reserved_size1) { max_depth = integer_log2(reserved_size1) + 1; size_ = 0; - reserved_size = ((dimension_type)1 << max_depth) - 1; + reserved_size = (static_cast<dimension_type>(1) << max_depth) - 1; indexes = new dimension_type[reserved_size + 2]; try { data = data_allocator.allocate(reserved_size + 1); @@ -574,7 +574,7 @@ PPL::CO_Tree::structure_OK() const { if (reserved_size < 3) return false; - if (reserved_size != ((dimension_type)1 << max_depth) - 1) + if (reserved_size != (static_cast<dimension_type>(1) << max_depth) - 1) return false; if (data == NULL) @@ -752,7 +752,8 @@ PPL::CO_Tree::rebalance(tree_iterator itr, dimension_type key, height_t itr_depth_minus_1 = itr.depth() - 1; height_t height = max_depth - itr_depth_minus_1; dimension_type subtree_size; - dimension_type subtree_reserved_size = ((dimension_type)1 << height) - 1; + dimension_type subtree_reserved_size = (static_cast<dimension_type>(1) + << height) - 1; const bool deleting = itr.index() == unused_index; PPL_ASSERT(deleting || key != unused_index); if (deleting) diff --git a/src/CO_Tree.templates.hh b/src/CO_Tree.templates.hh index 1831302..488f541 100644 --- a/src/CO_Tree.templates.hh +++ b/src/CO_Tree.templates.hh @@ -36,7 +36,7 @@ CO_Tree::CO_Tree(Iterator i, dimension_type n) { } dimension_type new_max_depth = integer_log2(n) + 1; - reserved_size = ((dimension_type)1 << new_max_depth) - 1; + reserved_size = (static_cast<dimension_type>(1) << new_max_depth) - 1; if (is_greater_than_ratio(n, reserved_size, max_density_percent) && reserved_size != 3) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 1b29841..d1865c5 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -215,10 +215,10 @@ struct float_intel_double_extended { static const uint32_t MSP_NEG_INF = 0x0000ffff; static const uint32_t MSP_POS_ZERO = 0x00000000; static const uint32_t MSP_NEG_ZERO = 0x00008000; - static const uint64_t LSP_INF = (uint64_t)0x8000000000000000ULL; + static const uint64_t LSP_INF = static_cast<uint64_t>(0x8000000000000000ULL); static const uint64_t LSP_ZERO = 0; - static const uint64_t LSP_DMAX = (uint64_t)0x7fffffffffffffffULL; - static const uint64_t LSP_NMAX = (uint64_t)0xffffffffffffffffULL; + static const uint64_t LSP_DMAX = static_cast<uint64_t>(0x7fffffffffffffffULL); + static const uint64_t LSP_NMAX = static_cast<uint64_t>(0xffffffffffffffffULL); static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 63; @@ -252,14 +252,14 @@ struct float_ieee754_quad { uint64_t lsp; uint64_t msp; #endif - static const uint64_t MSP_SGN_MASK = (uint64_t)0x8000000000000000ULL; - static const uint64_t MSP_POS_INF = (uint64_t)0x7fff000000000000ULL; - static const uint64_t MSP_NEG_INF = (uint64_t)0xffff000000000000ULL; - static const uint64_t MSP_POS_ZERO = (uint64_t)0x0000000000000000ULL; - static const uint64_t MSP_NEG_ZERO = (uint64_t)0x8000000000000000ULL; + static const uint64_t MSP_SGN_MASK = static_cast<uint64_t>(0x8000000000000000ULL); + static const uint64_t MSP_POS_INF = static_cast<uint64_t>(0x7fff000000000000ULL); + static const uint64_t MSP_NEG_INF = static_cast<uint64_t>(0xffff000000000000ULL); + static const uint64_t MSP_POS_ZERO = static_cast<uint64_t>(0x0000000000000000ULL); + static const uint64_t MSP_NEG_ZERO = static_cast<uint64_t>(0x8000000000000000ULL); static const uint64_t LSP_INF = 0; static const uint64_t LSP_ZERO = 0; - static const uint64_t LSP_MAX = (uint64_t)0xffffffffffffffffULL; + static const uint64_t LSP_MAX = static_cast<uint64_t>(0xffffffffffffffffULL); static const unsigned int BASE = 2; static const unsigned int EXPONENT_BITS = 15; static const unsigned int MANTISSA_BITS = 112; diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index ce371e0..ebfb716 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -362,7 +362,7 @@ float_intel_double_extended::inc() { inline void float_intel_double_extended::set_max(bool negative) { msp = 0x00007ffe; - lsp = (uint64_t)0xffffffffffffffffULL; + lsp = static_cast<uint64_t>(0xffffffffffffffffULL); if (negative) msp |= MSP_SGN_MASK; } @@ -441,8 +441,8 @@ float_ieee754_quad::inc() { inline void float_ieee754_quad::set_max(bool negative) { - msp = (uint64_t)0x7ffeffffffffffffULL; - lsp = (uint64_t)0xffffffffffffffffULL; + msp = static_cast<uint64_t>(0x7ffeffffffffffffULL); + lsp = static_cast<uint64_t>(0xffffffffffffffffULL); if (negative) msp |= MSP_SGN_MASK; } @@ -453,7 +453,7 @@ float_ieee754_quad::build(bool negative, mpz_t mantissa, int exponent) { mpz_export(parts, 0, -1, 8, 0, 0, mantissa); lsp = parts[0]; msp = parts[1]; - msp &= ((((uint64_t)1) << (MANTISSA_BITS - 64)) - 1); + msp &= ((static_cast<uint64_t>(1) << (MANTISSA_BITS - 64)) - 1); if (negative) msp |= MSP_SGN_MASK; int exponent_repr = exponent + EXPONENT_BIAS; diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh index 7be0400..febedb0 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -329,7 +329,7 @@ public: case V_EQ: case V_NE: assign(UNIVERSE); - rs = (Relation_Symbol) c.rel(); + rs = static_cast<Relation_Symbol>(c.rel()); return refine_existential(rs, c.value()); } } diff --git a/src/checked_mpq.inlines.hh b/src/checked_mpq.inlines.hh index c702d0d..3ed1cb9 100644 --- a/src/checked_mpq.inlines.hh +++ b/src/checked_mpq.inlines.hh @@ -50,7 +50,7 @@ classify_mpq(const mpq_class& v, bool nan, bool inf, bool sign) { } } if (sign) - return (Result) sgn<Policy>(v); + return static_cast<Result>(sgn<Policy>(v)); return V_LGE; } diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 8ba2c4d..afa84b0 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -87,7 +87,7 @@ classify_mpz(const mpz_class& v, bool nan, bool inf, bool sign) { } } if (sign) - return (Result) sgn<Policy>(v); + return static_cast<Result>(sgn<Policy>(v)); return V_LGE; } diff --git a/src/intervals.defs.hh b/src/intervals.defs.hh index 29c1081..a4f3754 100644 --- a/src/intervals.defs.hh +++ b/src/intervals.defs.hh @@ -61,15 +61,18 @@ enum I_Result { }; inline I_Result operator|(I_Result a, I_Result b) { - return static_cast<I_Result>((unsigned)a | (unsigned)b); + return static_cast<I_Result>(static_cast<unsigned>(a) + | static_cast<unsigned>(b)); } inline I_Result operator&(I_Result a, I_Result b) { - return static_cast<I_Result>((unsigned)a & (unsigned)b); + return static_cast<I_Result>(static_cast<unsigned>(a) + & static_cast<unsigned>(b)); } inline I_Result operator-(I_Result a, I_Result b) { - return static_cast<I_Result>((unsigned)a & ~(unsigned)b); + return static_cast<I_Result>(static_cast<unsigned>(a) + & ~static_cast<unsigned>(b)); } template <typename Criteria, typename T> @@ -340,7 +343,7 @@ struct I_Constraint_Rel { PPL_ASSERT(result_relation_class(r) == r); } I_Constraint_Rel(Relation_Symbol r) - : rel((Result)r) { + : rel(static_cast<Result>(r)) { } operator Result() const { return rel;

1 0

[GIT] ppl/ppl(master): Added helper function Implementation:: num_constraints().
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 6bb782d283cc62200324e028c310428a4eb68b78 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6bb782d283cc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 14:02:19 2012 +0100 Added helper function Implementation::num_constraints(). When implementing it, avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/Box.templates.hh | 4 ++-- src/Constraint_System.defs.hh | 14 ++++++++++++++ src/Constraint_System.inlines.hh | 12 ++++++++++++ src/PIP_Tree.cc | 10 +++++----- src/termination.cc | 30 +++++++++++++++--------------- 5 files changed, 48 insertions(+), 22 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index e20fdc4..af2e245 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -2712,8 +2712,8 @@ Box<ITV> const Constraint_System::const_iterator cs_begin = cs.begin(); const Constraint_System::const_iterator cs_end = cs.end(); - const dimension_type cs_size = std::distance(cs_begin, cs_end); - const dimension_type propagation_weight = cs_size * space_dim; + const dimension_type propagation_weight + = Implementation::num_constraints(cs) * space_dim; Sequence copy; bool changed; diff --git a/src/Constraint_System.defs.hh b/src/Constraint_System.defs.hh index 0475af8..d5dff3b 100644 --- a/src/Constraint_System.defs.hh +++ b/src/Constraint_System.defs.hh @@ -402,6 +402,20 @@ private: void add_low_level_constraints(); }; +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +//! Helper returning number of constraints in system. +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +dimension_type +num_constraints(const Constraint_System& cs); + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library + // Constraint_System.inlines.hh is not included here on purpose. #endif // !defined(PPL_Constraint_System_defs_hh) diff --git a/src/Constraint_System.inlines.hh b/src/Constraint_System.inlines.hh index 96f6d6b..c36a612 100644 --- a/src/Constraint_System.inlines.hh +++ b/src/Constraint_System.inlines.hh @@ -215,6 +215,18 @@ swap(Constraint_System& x, Constraint_System& y) { x.m_swap(y); } +namespace Implementation { + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +/*! \relates Parma_Polyhedra_Library::Constraint_System */ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +inline dimension_type +num_constraints(const Constraint_System& cs) { + return static_cast<dimension_type>(std::distance(cs.begin(), cs.end())); +} + +} // namespace Implementation + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_Constraint_System_inlines_hh) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index f4b2f28..7977964 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -115,7 +115,7 @@ void merge_assign(Matrix& x, const Constraint_System& y, const Variables_Set& parameters) { PPL_ASSERT(parameters.size() == x.num_columns() - 1); - const dimension_type new_rows = std::distance(y.begin(), y.end()); + const dimension_type new_rows = Implementation::num_constraints(y); if (new_rows == 0) return; const dimension_type old_num_rows = x.num_rows(); @@ -1254,8 +1254,7 @@ PIP_Decision_Node::OK() const { // Decision nodes with a false child must have exactly one constraint. if (false_child != 0) { - dimension_type dist = std::distance(constraints_.begin(), - constraints_.end()); + dimension_type dist = Implementation::num_constraints(constraints_); if (dist != 1) { #ifndef NDEBUG std::cerr << "PIP_Decision_Node with a 'false' child has " @@ -1321,7 +1320,7 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, if (has_false_child) { // Decision nodes with false child must have exactly one constraint - PPL_ASSERT(1 == std::distance(constraints_.begin(), constraints_.end())); + PPL_ASSERT(1 == Implementation::num_constraints(constraints_)); // NOTE: modify context_true in place, complementing its last constraint. Matrix& context_false = context_true; Row& last = context_false[context_false.num_rows() - 1]; @@ -2244,7 +2243,8 @@ PIP_Solution_Node::update_tableau( // Compute the column number of big parameter in tableau.t matrix. Variables_Set::const_iterator pos = parameters.find(pip.big_parameter_dimension); - big_dimension = std::distance(parameters.begin(), pos) + 1; + big_dimension = 1U + + static_cast<dimension_type>(std::distance(parameters.begin(), pos)); } Coefficient_traits::const_reference denom = tableau.denominator(); diff --git a/src/termination.cc b/src/termination.cc index c7a59a4..db33684 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -148,7 +148,7 @@ fill_constraint_systems_MS(const Constraint_System& cs, Constraint_System& cs_out2) { PPL_ASSERT(cs.space_dimension() % 2 == 0); const dimension_type n = cs.space_dimension() / 2; - const dimension_type m = std::distance(cs.begin(), cs.end()); + const dimension_type m = num_constraints(cs); #if PRINT_DEBUG_INFO Variable::output_function_type* p_default_output_function @@ -362,8 +362,8 @@ fill_constraint_system_PR(const Constraint_System& cs_before, PPL_ASSERT(cs_after.space_dimension() % 2 == 0); PPL_ASSERT(2*cs_before.space_dimension() == cs_after.space_dimension()); const dimension_type n = cs_before.space_dimension(); - const dimension_type r = distance(cs_before.begin(), cs_before.end()); - const dimension_type s = distance(cs_after.begin(), cs_after.end()); + const dimension_type r = num_constraints(cs_before); + const dimension_type s = num_constraints(cs_after); const dimension_type m = r + s; // Make sure linear expressions are not reallocated multiple times. @@ -439,7 +439,7 @@ fill_constraint_system_PR_original(const Constraint_System& cs, Linear_Expression& le_out) { PPL_ASSERT(cs.space_dimension() % 2 == 0); const dimension_type n = cs.space_dimension() / 2; - const dimension_type m = distance(cs.begin(), cs.end()); + const dimension_type m = num_constraints(cs); // Make sure linear expressions are not reallocated multiple times. if (m > 0) @@ -535,7 +535,7 @@ all_affine_ranking_functions_MS(const Constraint_System& cs, Variable::set_output_function(output_function_MS); output_function_MS_n = n; - output_function_MS_m = std::distance(cs.begin(), cs.end()); + output_function_MS_m = num_constraints(cs); std::cout << "*** ph1 projected ***" << std::endl; output_function_MS_which = 4; @@ -580,7 +580,7 @@ all_affine_quasi_ranking_functions_MS(const Constraint_System& cs, Variable::set_output_function(output_function_MS); output_function_MS_n = n; - output_function_MS_m = std::distance(cs.begin(), cs.end()); + output_function_MS_m = num_constraints(cs); std::cout << "*** ph1 projected ***" << std::endl; output_function_MS_which = 4; @@ -624,8 +624,8 @@ termination_test_PR(const Constraint_System& cs_before, = Variable::get_output_function(); Variable::set_output_function(output_function_PR); - output_function_PR_r = distance(cs_before.begin(), cs_before.end()); - output_function_PR_s = distance(cs_after.begin(), cs_after.end()); + output_function_PR_r = num_constraints(cs_before); + output_function_PR_s = num_constraints(cs_after); std::cout << "*** cs_mip ***" << std::endl; using namespace IO_Operators; @@ -656,8 +656,8 @@ one_affine_ranking_function_PR(const Constraint_System& cs_before, = Variable::get_output_function(); Variable::set_output_function(output_function_PR); - output_function_PR_r = distance(cs_before.begin(), cs_before.end()); - output_function_PR_s = distance(cs_after.begin(), cs_after.end()); + output_function_PR_r = num_constraints(cs_before); + output_function_PR_s = num_constraints(cs_after); std::cout << "*** cs_mip ***" << std::endl; using namespace IO_Operators; @@ -709,7 +709,7 @@ one_affine_ranking_function_PR_original(const Constraint_System& cs, Generator& mu) { PPL_ASSERT(cs.space_dimension() % 2 == 0); const dimension_type n = cs.space_dimension() / 2; - const dimension_type m = std::distance(cs.begin(), cs.end()); + const dimension_type m = num_constraints(cs); Constraint_System cs_mip; Linear_Expression le_ineq; @@ -771,8 +771,8 @@ all_affine_ranking_functions_PR(const Constraint_System& cs_before, = Variable::get_output_function(); Variable::set_output_function(output_function_PR); - output_function_PR_r = distance(cs_before.begin(), cs_before.end()); - output_function_PR_s = distance(cs_after.begin(), cs_after.end()); + output_function_PR_r = num_constraints(cs_before); + output_function_PR_s = num_constraints(cs_after); std::cout << "*** cs_eqs ***" << std::endl; using namespace IO_Operators; @@ -784,7 +784,7 @@ all_affine_ranking_functions_PR(const Constraint_System& cs_before, NNC_Polyhedron ph(cs_eqs); ph.add_constraint(le_ineq < 0); // u_3 corresponds to space dimensions 0, ..., s - 1. - const dimension_type s = distance(cs_after.begin(), cs_after.end()); + const dimension_type s = num_constraints(cs_after); ph.remove_higher_space_dimensions(s); #if PRINT_DEBUG_INFO @@ -856,7 +856,7 @@ all_affine_ranking_functions_PR_original(const Constraint_System& cs, NNC_Polyhedron& mu_space) { PPL_ASSERT(cs.space_dimension() % 2 == 0); const dimension_type n = cs.space_dimension() / 2; - const dimension_type m = distance(cs.begin(), cs.end()); + const dimension_type m = num_constraints(cs); if (m == 0) { // If there are no constraints at all, we have non-termination,

1 0