- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Enclose macro argument in parentheses.
by Roberto Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: f26f9957b54a3e328e9dd9562cf95ec96f503058 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f26f9957b54a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Feb 23 19:59:13 2012 +0100 Enclose macro argument in parentheses. Detected by ECLAIR service macrbody. --- src/compiler.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 1ee7a9b..0aa3e85 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -77,7 +77,8 @@ struct Suppress_Uninitialized_Warnings_Type { type name #endif -#define sizeof_to_bits(size) (size * static_cast<std::size_t>(CHAR_BIT)) +#define sizeof_to_bits(size) \ + ((size) * static_cast<std::size_t>(CHAR_BIT)) #if !defined(__GNUC__)

1 0

[GIT] ppl/ppl(master): Removed interval restrictions.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: b5afe018d5f069b74c9603986a0b83e17c66316f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b5afe018d5f0… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 18:41:57 2012 +0100 Removed interval restrictions. --- interfaces/interfaced_boxes.hh | 21 +- src/Boundary.defs.hh | 62 +-- src/Box.templates.hh | 4 - src/Checked_Number.defs.hh | 2 +- src/Integer_Interval.hh | 5 +- src/Interval.defs.hh | 91 +---- src/Interval.inlines.hh | 73 +--- src/Interval.templates.hh | 1 - src/Interval_Info.defs.hh | 26 +- src/Interval_Restriction.defs.hh | 877 ------------------------------------ src/Makefile.am | 1 - src/Rational_Interval.hh | 6 +- tests/Box/interval1.cc | 6 +- tests/Box/refinewithconstraint2.cc | 6 +- tests/ppl_test.hh | 10 +- 15 files changed, 42 insertions(+), 1149 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b5afe018…

1 0

[GIT] ppl/ppl(master): Prefer using C_Integer traits rather than <climits> macros,
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: b736306cfce299d80dd85052d6c6c93bdbc2cdf1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b736306cfce2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 18:40:30 2012 +0100 Prefer using C_Integer traits rather than <climits> macros, thereby avoiding implicit conversions changing type signedness. Detected by ECLAIR service utypflag. --- src/Bit_Row.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 159cf48..fb10b91 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -57,13 +57,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) { PPL_ASSERT(z_size >= 0); if (y_size < z_size) { PPL_ASSERT(static_cast<unsigned long>(z_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_init2(vec, static_cast<unsigned long>(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); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_init2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } @@ -135,13 +135,13 @@ Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) { PPL_ASSERT(y_size >= 0); if (x_size < y_size) { PPL_ASSERT(static_cast<unsigned long>(y_size) - <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_realloc2(vec, static_cast<unsigned long>(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); + <= C_Integer<unsigned long>::max / PPL_BITS_PER_GMP_LIMB); mpz_realloc2(vec, static_cast<unsigned long>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); }

1 0

[GIT] ppl/ppl(master): Rewritten function to avoid mixing signed and unsigned integer types.
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 0739cd0ea3eaac5d117266245898b505901da822 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0739cd0ea3ea… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 18:21:22 2012 +0100 Rewritten function to avoid mixing signed and unsigned integer types. Detected by ECLAIR service utypflag. --- src/wrap_string.cc | 57 +++++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/wrap_string.cc b/src/wrap_string.cc index 1845f8d..06dac11 100644 --- a/src/wrap_string.cc +++ b/src/wrap_string.cc @@ -23,6 +23,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "wrap_string.hh" +#include "assert.hh" #include <cstdlib> namespace Parma_Polyhedra_Library { @@ -31,48 +32,50 @@ namespace IO_Operators { std::string wrap_string(const std::string& src_string, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { + const unsigned indent_depth, + const unsigned preferred_first_line_length, + const unsigned preferred_line_length) { + const unsigned npos = C_Integer<unsigned>::max; std::string dst_string; const char *src = src_string.c_str(); - for (int line = 0; ; ++line) { - int line_length = ((line == 0) - ? preferred_first_line_length - : preferred_line_length); - int last_comma = -1; - int last_space = -1; - int split_pos = -1; - int i; - for (i = 0; i <= line_length; ++i) { - if (src[i] == '\0' || src[i] == '\n') { - split_pos = i; + for (unsigned line = 0; ; ++line) { + const unsigned line_length = ((line == 0) + ? preferred_first_line_length + : preferred_line_length); + unsigned last_comma = npos; + unsigned last_space = npos; + unsigned split_pos = npos; + unsigned idx; + for (idx = 0; idx <= line_length; ++idx) { + if (src[idx] == '\0' || src[idx] == '\n') { + split_pos = idx; break; } - if (src[i] == ',' && i < line_length) - last_comma = i; - if (is_space(src[i]) && (i == 0 || !is_space(src[i-1]))) - last_space = i; + if (src[idx] == ',' && idx < line_length) + last_comma = idx; + if (is_space(src[idx]) && (idx == 0 || !is_space(src[idx-1]))) + last_space = idx; } - if (split_pos < 0) { - if (last_comma >= 0) + if (split_pos == npos) { + if (last_comma != npos) split_pos = last_comma + 1; - else if (last_space >= 0) + else if (last_space != npos) split_pos = last_space; else { - for ( ; src[i] != 0; ++i) { - if (src[i] == ',') { - ++i; + for ( ; src[idx] != 0; ++idx) { + if (src[idx] == ',') { + ++idx; break; } - if (is_space(src[i])) + if (is_space(src[idx])) break; } - split_pos = i; + split_pos = idx; } } + PPL_ASSERT(split_pos != npos); if (split_pos > 0 && line > 0 && indent_depth > 0) - dst_string.append(indent_depth, ' '); + dst_string.append(indent_depth, ' '); dst_string.append(src, split_pos); src += split_pos; if (is_space(*src))

1 0

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

23 Feb '12

Module: ppl/ppl Branch: master Commit: 876b91f81ffc77c5fdbc0ca3935e6025f1853e9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=876b91f81ffc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 15:37:18 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- src/MIP_Problem.cc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index e3ad951..83eeeb8 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -744,13 +744,14 @@ PPL::MIP_Problem::process_pending_constraints() { // * number of non-pending constraints that are no longer satisfied // due to re-merging of split variables. - dimension_type num_satisfied_inequalities - = std::count(is_satisfied_inequality.begin(), - is_satisfied_inequality.end(), - true); + const dimension_type num_satisfied_inequalities + = static_cast<dimension_type>(std::count(is_satisfied_inequality.begin(), + is_satisfied_inequality.end(), + true)); const dimension_type unfeasible_tableau_rows_size = unfeasible_tableau_rows.size(); + PPL_ASSERT(additional_tableau_rows >= num_satisfied_inequalities); const dimension_type additional_artificial_vars = (additional_tableau_rows - num_satisfied_inequalities) + unfeasible_tableau_rows_size;

1 0

[GIT] ppl/ppl(master): Improved strcaseeq implementation.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: c5fabffdb88abe18d5df5e2cdf5360361f61858b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c5fabffdb88a… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:35:54 2012 +0100 Improved strcaseeq implementation. --- src/ppl-config.cc.in | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 167d515..448f354 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -164,16 +164,19 @@ void internal_error() { fatal("internal error: please submit a bug report to ppl-devel(a)cs.unipr.it"); } +inline char to_lower(char c) { + return static_cast<char>(tolower(static_cast<int>(static_cast<unsigned char>(c)))); +} + bool strcaseeq(const char* s1, const char* s2) { - while (*s1 != 0 && *s2 != 0 - && tolower(static_cast<unsigned char>(*s1)) - == tolower(static_cast<unsigned char>(*s2))) { + while (*s1 != 0) { + if (*s2 == 0 || to_lower(*s1) != to_lower(*s2)) + return false; ++s1; ++s2; } - return tolower(static_cast<unsigned char>(*s1)) - == tolower(static_cast<unsigned char>(*s2)); + return *s2 == 0; } void

1 0

[GIT] ppl/ppl(master): Fixed cast. Detected by ECLAIR service utypflag.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 3e985e2756163cf85e29af42fc35f45b75657e05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3e985e275616… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:12:44 2012 +0100 Fixed cast. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 165c839..11ab3ff 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -53,7 +53,7 @@ PPL::Bit_Row::next(unsigned long position) const { // unsigned long r = mpz_scan1(vec, position); // return (r == C_Integer<unsigned long>::max) ? -1 : r; - mp_size_t li = position / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); + mp_size_t li = static_cast<mp_size_t>(position / PPL_BITS_PER_GMP_LIMB); const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size >= 0); if (li >= vec_size) @@ -102,7 +102,7 @@ PPL::Bit_Row::prev(unsigned long position) const { const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size > 0); - mp_size_t li = position / static_cast<mp_size_t>(PPL_BITS_PER_GMP_LIMB); + mp_size_t li = static_cast<mp_size_t>(position / PPL_BITS_PER_GMP_LIMB); mp_limb_t limb; mp_srcptr p = vec->_mp_d;

1 0

[GIT] ppl/ppl(master): Fixed signedness. Detected by ECLAIR service utypflag.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: c43fa8739a05e831357a67ad81da925aa89edf37 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c43fa8739a05… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 15:11:19 2012 +0100 Fixed signedness. Detected by ECLAIR service utypflag. --- src/Checked_Number.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index 6e97d02..767b810 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -378,7 +378,7 @@ template <typename To, typename From> \ inline typename Enable_If<Is_Native_Or_Checked<To>::value \ && Is_Native_Or_Checked<From>::value, \ Result>::type \ -name(To& to, const From& x, int exp, Rounding_Dir dir) { \ +name(To& to, const From& x, unsigned int exp, Rounding_Dir dir) { \ return \ check_result(Checked::func<typename Native_Checked_To_Wrapper<To> \ ::Policy, \

1 0

[GIT] ppl/ppl(master): Simplified implementation of method Grid:: reduce_reduced().
by Enea Zaffanella 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 66e260f7483f86e3bbe79b32550f2402453a9fe8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=66e260f7483f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 23 14:53:02 2012 +0100 Simplified implementation of method Grid::reduce_reduced(). While at it, got rid of a few implicit conversions changing signedness. Detected by ECLAIR service utypflag. --- src/Grid.templates.hh | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index 539a5e9..8145c54 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -280,33 +280,31 @@ Grid::reduce_reduced(M& sys, PPL_DIRTY_TEMP_COEFFICIENT(pivot_dim_half); pivot_dim_half = (pivot_dim + 1) / 2; - Dimension_Kind row_kind = sys_dim_kinds[dim]; - Dimension_Kind line_or_equality, virtual_kind; - int jump; - if (generators) { - line_or_equality = LINE; - virtual_kind = GEN_VIRTUAL; - jump = -1; - } - else { - line_or_equality = EQUALITY; - virtual_kind = CON_VIRTUAL; - jump = 1; - } + const Dimension_Kind row_kind = sys_dim_kinds[dim]; + const bool row_is_line_or_equality + = (row_kind == (generators ? LINE : EQUALITY)); PPL_DIRTY_TEMP_COEFFICIENT(num_rows_to_subtract); PPL_DIRTY_TEMP_COEFFICIENT(row_dim_remainder); - for (dimension_type row_index = pivot_index, kinds_index = dim + jump; - row_index-- > 0; - kinds_index += jump) { - // Move over any virtual rows. - while (sys_dim_kinds[kinds_index] == virtual_kind) - kinds_index += jump; + for (dimension_type kinds_index = dim, + row_index = pivot_index; row_index-- > 0; ) { + if (generators) { + --kinds_index; + // Move over any virtual rows. + while (sys_dim_kinds[kinds_index] == GEN_VIRTUAL) + --kinds_index; + } + else { + ++kinds_index; + // Move over any virtual rows. + while (sys_dim_kinds[kinds_index] == CON_VIRTUAL) + ++kinds_index; + } // row_kind CONGRUENCE is included as PARAMETER - if (row_kind == line_or_equality + if (row_is_line_or_equality || (row_kind == PARAMETER - && sys_dim_kinds[kinds_index] == PARAMETER)) { + && sys_dim_kinds[kinds_index] == PARAMETER)) { R& row = sys[row_index]; const Coefficient& row_dim = row[dim];

1 0

[GIT] ppl/ppl(master): mp_bitcnt_t is not present in gmp 3.
by Abramo Bagnara 23 Feb '12

23 Feb '12

Module: ppl/ppl Branch: master Commit: 0426fd6f655b115197d632e43a59bbf58826a417 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0426fd6f655b… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 23 14:30:50 2012 +0100 mp_bitcnt_t is not present in gmp 3. --- src/Bit_Row.inlines.hh | 8 ++++---- src/checked_float.inlines.hh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 46a1236..159cf48 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, static_cast<mp_bitcnt_t>(z_size) * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<unsigned long>(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, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); + mpz_init2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB); union_helper(z, y); } } @@ -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, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<unsigned long>(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, static_cast<mp_bitcnt_t>(x_size) * PPL_BITS_PER_GMP_LIMB); + mpz_realloc2(vec, static_cast<unsigned long>(x_size) * PPL_BITS_PER_GMP_LIMB); union_helper(y, x); } } diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 029bc6e..03e1bc7 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -886,11 +886,11 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) { mpz_init(mantissa); long shift = static_cast<long>(needed_bits) - exponent; if (shift > 0) { - mpz_mul_2exp(mantissa, numer_z, static_cast<mp_bitcnt_t>(shift)); + mpz_mul_2exp(mantissa, numer_z, static_cast<unsigned long>(shift)); numer_z = mantissa; } else if (shift < 0) { - mpz_mul_2exp(mantissa, denom_z, static_cast<mp_bitcnt_t>(-shift)); + mpz_mul_2exp(mantissa, denom_z, static_cast<unsigned long>(-shift)); denom_z = mantissa; } mpz_t r;

1 0