February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added helper is_space(), to be used instead of directly calling isspace().
by Enea Zaffanella 17 Feb '12

17 Feb '12

Module: ppl/ppl Branch: master Commit: 249a29efe092ce88e00fec45b2e00a9ca1bdb20b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=249a29efe092… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 17 08:50:34 2012 +0100 Added helper is_space(), to be used instead of directly calling isspace(). --- src/Interval.templates.hh | 6 +++--- src/checked.cc | 2 +- src/globals.defs.hh | 3 +++ src/globals.inlines.hh | 6 ++++++ src/wrap_string.cc | 6 +++--- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Interval.templates.hh b/src/Interval.templates.hh index 8a77acc..b1425ec 100644 --- a/src/Interval.templates.hh +++ b/src/Interval.templates.hh @@ -241,7 +241,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { do { if (!is.get(c)) goto fail; - } while (isspace(c)); + } while (is_space(c)); // Get the opening parenthesis and handle the empty interval case. if (c == '(') @@ -270,7 +270,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { do { if (!is.get(c)) goto fail; - } while (isspace(c)); + } while (is_space(c)); if (c != ',') goto unexpected; @@ -284,7 +284,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { do { if (!is.get(c)) goto fail; - } while (isspace(c)); + } while (is_space(c)); if (c == ')') upper_open = true; else if (c != ']') { diff --git a/src/checked.cc b/src/checked.cc index e35ed75..2fc1900 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -147,7 +147,7 @@ parse_number_part(std::istream& is, number_struct& numer) { do { if (!is.get(c)) return V_CVT_STR_UNK; - } while (isspace(c)); + } while (is_space(c)); switch (c) { case '-': numer.neg_mantissa = true; diff --git a/src/globals.defs.hh b/src/globals.defs.hh index b2bf946..cafe55a 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -350,6 +350,9 @@ struct Recycle_Input { << "for " PPL_XSTR(class_prefix) << "." << std::endl; \ } +//! Returns <CODE>true</CODE> if \p c is any kind of space character. +bool is_space(char c); + template <typename T, long long v, typename Enable = void> struct Fit : public False { }; diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index f132ea5..97bde3f 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -26,6 +26,7 @@ site: http://bugseng.com/products/ppl/ . */ #include <limits> #include <cassert> +#include <cctype> namespace Parma_Polyhedra_Library { @@ -120,6 +121,11 @@ total_memory_in_bytes(const mpq_class& x) { return sizeof(x) + external_memory_in_bytes(x); } +inline bool +is_space(char c) { + return isspace(c) != 0; +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_globals_inlines_hh) diff --git a/src/wrap_string.cc b/src/wrap_string.cc index 04f431e..1845f8d 100644 --- a/src/wrap_string.cc +++ b/src/wrap_string.cc @@ -51,7 +51,7 @@ wrap_string(const std::string& src_string, } if (src[i] == ',' && i < line_length) last_comma = i; - if (isspace(src[i]) && (i == 0 || !isspace(src[i-1]))) + if (is_space(src[i]) && (i == 0 || !is_space(src[i-1]))) last_space = i; } if (split_pos < 0) { @@ -65,7 +65,7 @@ wrap_string(const std::string& src_string, ++i; break; } - if (isspace(src[i])) + if (is_space(src[i])) break; } split_pos = i; @@ -75,7 +75,7 @@ wrap_string(const std::string& src_string, dst_string.append(indent_depth, ' '); dst_string.append(src, split_pos); src += split_pos; - if (isspace(*src)) + if (is_space(*src)) ++src; while (*src == ' ') ++src;

1 0

[GIT] ppl/ppl(master): Renamed is_infinity() as infinity_sign(), returning an `int' in {-1, 0, 1}.
by Enea Zaffanella 16 Feb '12

16 Feb '12

Module: ppl/ppl Branch: master Commit: 4921272596a31a0d7d68b67623911c2725736375 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4921272596a3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 22:45:01 2012 +0100 Renamed is_infinity() as infinity_sign(), returning an `int' in {-1, 0, 1}. Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/Boundary.defs.hh | 2 +- src/Checked_Number.defs.hh | 2 +- src/Checked_Number.inlines.hh | 2 +- src/Interval.defs.hh | 4 +- src/Interval.inlines.hh | 50 ++++++++++++++++++++-------------------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Boundary.defs.hh b/src/Boundary.defs.hh index 5af4328..72d8858 100644 --- a/src/Boundary.defs.hh +++ b/src/Boundary.defs.hh @@ -297,7 +297,7 @@ is_reverse_infinity(Boundary_Type type, const T& x, const Info& info) { template <typename T, typename Info> inline int -is_infinity(Boundary_Type type, const T& x, const Info& info) { +infinity_sign(Boundary_Type type, const T& x, const Info& info) { if (is_boundary_infinity(type, x, info)) return (type == LOWER) ? -1 : 1; else if (is_reverse_infinity(type, x, info)) diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh index ce29ee0..3b998ca 100644 --- a/src/Checked_Number.defs.hh +++ b/src/Checked_Number.defs.hh @@ -452,7 +452,7 @@ is_plus_infinity(const T& x); /*! \relates Checked_Number */ template <typename T> typename Enable_If<Is_Native_Or_Checked<T>::value, int>::type -is_infinity(const T& x); +infinity_sign(const T& x); /*! \relates Checked_Number */ template <typename T> diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index 18b1f51..6e97d02 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -239,7 +239,7 @@ is_plus_infinity(const T& x) { template <typename T> inline typename Enable_If<Is_Native_Or_Checked<T>::value, int>::type -is_infinity(const T& x) { +infinity_sign(const T& x) { return is_minus_infinity(x) ? -1 : (is_plus_infinity(x) ? 1 : 0); } diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh index 5ee45f5..bd0045b 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -456,7 +456,7 @@ public: info().set_boundary_property(UPPER, OPEN, true); } - bool is_infinity() const { + int infinity_sign() const { PPL_ASSERT(OK()); if (is_reverse_infinity(LOWER, lower(), info())) return 1; @@ -519,7 +519,7 @@ public: return assign(refinement); PPL_DIRTY_TEMP(Boundary, u); Result result = sub_2exp_assign_r(u, upper(), w, ROUND_UP); - if (!result_overflow(result) && u > lower()) + if (result_overflow(result) == 0 && u > lower()) return assign(refinement); info().clear(); switch (r) { diff --git a/src/Interval.inlines.hh b/src/Interval.inlines.hh index e3b15da..f8e659d 100644 --- a/src/Interval.inlines.hh +++ b/src/Interval.inlines.hh @@ -60,8 +60,8 @@ f_is_singleton(const Interval<Boundary, Info>& x) { } template <typename Boundary, typename Info> inline int -is_infinity(const Interval<Boundary, Info>& x) { - return x.is_infinity(); +infinity_sign(const Interval<Boundary, Info>& x) { + return x.infinity_sign(); } namespace Interval_NS { @@ -614,16 +614,16 @@ Interval<To_Boundary, To_Info>::add_assign(const From1& x, const From2& y) { PPL_ASSERT(f_OK(y)); if (check_empty_arg(x) || check_empty_arg(y)) return assign(EMPTY); - int inf = Parma_Polyhedra_Library::is_infinity(x); - if (inf) { - if (Parma_Polyhedra_Library::is_infinity(y) == -inf) + int inf_sign = Parma_Polyhedra_Library::infinity_sign(x); + if (inf_sign != 0) { + if (Parma_Polyhedra_Library::infinity_sign(y) == -inf_sign) return assign(EMPTY); } else - inf = Parma_Polyhedra_Library::is_infinity(y); - if (inf < 0) + inf_sign = Parma_Polyhedra_Library::infinity_sign(y); + if (inf_sign < 0) return assign(MINUS_INFINITY); - else if (inf > 0) + else if (inf_sign > 0) return assign(PLUS_INFINITY); PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); @@ -651,16 +651,16 @@ Interval<To_Boundary, To_Info>::sub_assign(const From1& x, const From2& y) { PPL_ASSERT(f_OK(y)); if (check_empty_arg(x) || check_empty_arg(y)) return assign(EMPTY); - int inf = Parma_Polyhedra_Library::is_infinity(x); - if (inf) { - if (Parma_Polyhedra_Library::is_infinity(y) == inf) + int inf_sign = Parma_Polyhedra_Library::infinity_sign(x); + if (inf_sign != 0) { + if (Parma_Polyhedra_Library::infinity_sign(y) == inf_sign) return assign(EMPTY); } else - inf = -Parma_Polyhedra_Library::is_infinity(y); - if (inf < 0) + inf_sign = -Parma_Polyhedra_Library::infinity_sign(y); + if (inf_sign < 0) return assign(MINUS_INFINITY); - else if (inf > 0) + else if (inf_sign > 0) return assign(PLUS_INFINITY); PPL_DIRTY_TEMP(To_Info, to_info); @@ -708,16 +708,16 @@ Interval<To_Boundary, To_Info>::mul_assign(const From1& x, const From2& y) { int xus = (xls > 0) ? 1 : sgn_b(UPPER, f_upper(x), f_info(x)); int yls = sgn_b(LOWER, f_lower(y), f_info(y)); int yus = (yls > 0) ? 1 : sgn_b(UPPER, f_upper(y), f_info(y)); - int inf = Parma_Polyhedra_Library::is_infinity(x); + int inf_sign = Parma_Polyhedra_Library::infinity_sign(x); int ls, us; - if (inf) { + if (inf_sign != 0) { ls = yls; us = yus; goto inf; } else { - inf = Parma_Polyhedra_Library::is_infinity(y); - if (inf) { + inf_sign = Parma_Polyhedra_Library::infinity_sign(y); + if (inf_sign != 0) { ls = xls; us = xus; inf: @@ -726,8 +726,8 @@ Interval<To_Boundary, To_Info>::mul_assign(const From1& x, const From2& y) { if (ls == -us) return set_infinities(); if (ls < 0 || us < 0) - inf = -inf; - if (inf < 0) + inf_sign = -inf_sign; + if (inf_sign < 0) return assign(MINUS_INFINITY); else return assign(PLUS_INFINITY); @@ -877,15 +877,15 @@ Interval<To_Boundary, To_Info>::div_assign(const From1& x, const From2& y) { int yus = (yls > 0) ? 1 : sgn_b(UPPER, f_upper(y), f_info(y)); if (yls == 0 && yus == 0) return assign(EMPTY); - int inf = Parma_Polyhedra_Library::is_infinity(x); - if (inf) { - if (Parma_Polyhedra_Library::is_infinity(y)) + int inf_sign = Parma_Polyhedra_Library::infinity_sign(x); + if (inf_sign != 0) { + if (Parma_Polyhedra_Library::infinity_sign(y) != 0) return assign(EMPTY); if (yls == -yus) return set_infinities(); if (yls < 0 || yus < 0) - inf = -inf; - if (inf < 0) + inf_sign = -inf_sign; + if (inf_sign < 0) return assign(MINUS_INFINITY); else return assign(PLUS_INFINITY);

1 0

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

16 Feb '12

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37719b83d11d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:48:03 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d4a79c9ad28… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:44:34 2012 +0100 Prefer `while (true)' and `while (false)' wrt `while (1)' and `while(0)'. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=af3d0755dad9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:39:07 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=69c5683e1657… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:37:02 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2b9312e845c2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:33:25 2012 +0100 Prefer explicit tests against zero. Do not abusing short-circuit operators (prefer explicit control flow). Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=72ea4b00d875… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 21:30:21 2012 +0100 Prefer explicit test against zero. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b5e126e5bc24… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 18:31:29 2012 +0100 Prefer explicit usage of the istream::fail() method. Detected by ECLAIR service utypflag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=77a999e4d467… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 16 18:13:59 2012 +0100 Rename as `const_bool_value' the "anonymous" enums encoding a bool value.

1 0

[GIT] ppl/ppl(master): Prefer using vector::resize wrt insert.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: ca495c20a548f8befaa4402a2bd970ec252fb373 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca495c20a548… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 22:48:38 2012 +0100 Prefer using vector::resize wrt insert. --- src/conversion.cc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/conversion.cc b/src/conversion.cc index 0f7e0b8..bb37274 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -398,9 +398,8 @@ PPL::Polyhedron::conversion(Linear_System& source, // product is 0 if and only if the generator saturates the // constraint. PPL_DIRTY_TEMP(std::vector<Coefficient>, scalar_prod); - const int needed_space = dest_num_rows - scalar_prod.size(); - if (needed_space > 0) - scalar_prod.insert(scalar_prod.end(), needed_space, Coefficient_zero()); + if (dest_num_rows > scalar_prod.size()) + scalar_prod.resize(dest_num_rows, Coefficient_zero()); // `index_non_zero' will indicate the first generator in `dest' // that does not saturate the constraint `source_k'. dimension_type index_non_zero = 0;

1 0

[GIT] ppl/ppl(master): Prefer explicit tests against zero.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 7c9fe958cb324b418ed19bba5ba6d99fba169cfe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7c9fe958cb32… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 22:47:35 2012 +0100 Prefer explicit tests against zero. Detected by ECLAIR service utypflag. --- src/Grid_Status.inlines.hh | 2 +- src/Result.inlines.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Grid_Status.inlines.hh b/src/Grid_Status.inlines.hh index 1539605..935217a 100644 --- a/src/Grid_Status.inlines.hh +++ b/src/Grid_Status.inlines.hh @@ -43,7 +43,7 @@ Grid::Status::test_all(flags_t mask) const { inline bool Grid::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } inline void diff --git a/src/Result.inlines.hh b/src/Result.inlines.hh index 4f0a97f..36e754d 100644 --- a/src/Result.inlines.hh +++ b/src/Result.inlines.hh @@ -71,7 +71,7 @@ result_overflow(Result r) { inline bool result_representable(Result r) { - return !(r & V_UNREPRESENTABLE); + return (r & V_UNREPRESENTABLE) == 0; } inline Result operator|(Result a, Result b) {

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: eb1e922ffe18c27b7b544781b745102730d8c2c4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eb1e922ffe18… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:38:51 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. While at it, simplified control flow by removing a use of `continue'. --- src/Congruence_System.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index 0cdb287..1c53eb2 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -503,10 +503,9 @@ PPL::operator==(const Congruence_System& x, const Congruence_System& y) { if (x.num_columns() == y.num_columns()) { dimension_type num_rows = x.num_rows(); if (num_rows == y.num_rows()) { - while (num_rows--) { - if (x[num_rows] == y[num_rows]) - continue; - return false; + while (num_rows-- > 0) { + if (x[num_rows] != y[num_rows]) + return false; } return true; }

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: e3c4d96c9830ac4233b84d178810b2dd3fcd7f9e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e3c4d96c9830… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:37:13 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Box_Status.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Box_Status.inlines.hh b/src/Box_Status.inlines.hh index acd8347..0153073 100644 --- a/src/Box_Status.inlines.hh +++ b/src/Box_Status.inlines.hh @@ -62,7 +62,7 @@ Box<ITV>::Status::test_all(flags_t mask) const { template <typename ITV> inline bool Box<ITV>::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } template <typename ITV>

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 61f5417dcdf35d4f56ba737a45eb7ebc494e2e41 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61f5417dcdf3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 17:21:18 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Bit_Row.cc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index e0e6376..f9c73bd 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -141,7 +141,7 @@ PPL::Bit_Row::operator[](const unsigned long k) const { return false; mp_limb_t limb = *(vec->_mp_d + i); - return (limb >> (k % GMP_NUMB_BITS)) & 1; + return ((limb >> (k % GMP_NUMB_BITS)) & 1) != 0; } void @@ -169,7 +169,7 @@ PPL::compare(const Bit_Row& x, const Bit_Row& y) { const mp_limb_t diff = xl ^ yl; // First bit that is different. const mp_limb_t mask = diff & ~(diff-1); - return (xl & mask) ? 1 : -1; + return ((xl & mask) != 0) ? 1 : -1; } ++xp; ++yp; @@ -190,7 +190,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y) { mp_srcptr xp = x.vec->_mp_d; mp_srcptr yp = y.vec->_mp_d; while (x_size > 0) { - if (*xp & ~*yp) + if ((*xp & ~*yp) != 0) return false; ++xp; ++yp; @@ -218,7 +218,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y, while (x_size > 0) { xl = *xp; yl = *yp; - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; strict_subset_next: ++xp; @@ -231,7 +231,7 @@ PPL::subset_or_equal(const Bit_Row& x, const Bit_Row& y, xl = *xp; yl = *yp; if (xl != yl) { - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; strict_subset = true; goto strict_subset_next; @@ -259,7 +259,7 @@ PPL::strict_subset(const Bit_Row& x, const Bit_Row& y) { while (x_size > 0) { const mp_limb_t xl = *xp; const mp_limb_t yl = *yp; - if (xl & ~yl) + if ((xl & ~yl) != 0) return false; if (!different && xl != yl) different = true;

1 0

[GIT] ppl/ppl(master): Added helper function to compute the hash code from a space dimension.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: dbd30b078d19997cdfeef23663310025fd8113a0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dbd30b078d19… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 16:34:30 2012 +0100 Added helper function to compute the hash code from a space dimension. Added missing has_code() method to class Box<ITV> and generate corresponding method in Java interface for boxes. --- ...nterface_generator_java_procedure_generators.m4 | 2 +- src/BD_Shape.inlines.hh | 2 +- src/Box.defs.hh | 8 ++++++++ src/Box.inlines.hh | 6 ++++++ src/Grid.inlines.hh | 2 +- src/Octagonal_Shape.inlines.hh | 2 +- src/Partially_Reduced_Product.inlines.hh | 2 +- src/Pointset_Ask_Tell.inlines.hh | 2 +- src/Pointset_Powerset.inlines.hh | 2 +- src/Polyhedron.inlines.hh | 2 +- src/globals.defs.hh | 4 ++++ src/globals.inlines.hh | 6 ++++++ 12 files changed, 32 insertions(+), 8 deletions(-) diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index b86af30..b81340a 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -42,7 +42,7 @@ dnl The <name> must be exactly as written here. m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', ppl_free_@CLASS@/1 +all, -ppl_@CLASS@_hashcode/2 +all -box, +ppl_@CLASS@_hashcode/2 +all, ppl_@CLASS@_string/1 +all, ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/1 +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2 +simple, diff --git a/src/BD_Shape.inlines.hh b/src/BD_Shape.inlines.hh index 2b95b2e..bb83e46 100644 --- a/src/BD_Shape.inlines.hh +++ b/src/BD_Shape.inlines.hh @@ -838,7 +838,7 @@ BD_Shape<T>::total_memory_in_bytes() const { template <typename T> inline int32_t BD_Shape<T>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename T> diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 8c1ccd5..695d7d4 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -1692,6 +1692,14 @@ public: //! Returns the size in bytes of the memory managed by \p *this. memory_size_type external_memory_in_bytes() const; + /*! \brief + Returns a 32-bit hash code for \p *this. + + If <CODE>x</CODE> and <CODE>y</CODE> are such that <CODE>x == y</CODE>, + then <CODE>x.hash_code() == y.hash_code()</CODE>. + */ + int32_t hash_code() const; + PPL_OUTPUT_DECLARATIONS #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS diff --git a/src/Box.inlines.hh b/src/Box.inlines.hh index b7b0f7e..b38e30f 100644 --- a/src/Box.inlines.hh +++ b/src/Box.inlines.hh @@ -133,6 +133,12 @@ Box<ITV>::max_space_dimension() { } template <typename ITV> +inline int32_t +Box<ITV>::hash_code() const { + return hash_code_from_dimension(space_dimension()); +} + +template <typename ITV> inline const ITV& Box<ITV>::operator[](const dimension_type k) const { PPL_ASSERT(k < seq.size()); diff --git a/src/Grid.inlines.hh b/src/Grid.inlines.hh index 222e42a..3500339 100644 --- a/src/Grid.inlines.hh +++ b/src/Grid.inlines.hh @@ -228,7 +228,7 @@ Grid::total_memory_in_bytes() const { inline int32_t Grid::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } inline Constraint_System diff --git a/src/Octagonal_Shape.inlines.hh b/src/Octagonal_Shape.inlines.hh index c42379e..12357e8 100644 --- a/src/Octagonal_Shape.inlines.hh +++ b/src/Octagonal_Shape.inlines.hh @@ -864,7 +864,7 @@ Octagonal_Shape<T>::total_memory_in_bytes() const { template <typename T> inline int32_t Octagonal_Shape<T>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename T> diff --git a/src/Partially_Reduced_Product.inlines.hh b/src/Partially_Reduced_Product.inlines.hh index 8239bd2..a9e53cf 100644 --- a/src/Partially_Reduced_Product.inlines.hh +++ b/src/Partially_Reduced_Product.inlines.hh @@ -709,7 +709,7 @@ Partially_Reduced_Product<D1, D2, R>::ascii_dump(std::ostream& s) const { template <typename D1, typename D2, typename R> inline int32_t Partially_Reduced_Product<D1, D2, R>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } /*! \relates Parma_Polyhedra_Library::Partially_Reduced_Product */ diff --git a/src/Pointset_Ask_Tell.inlines.hh b/src/Pointset_Ask_Tell.inlines.hh index 61b46fc..b4676b3 100644 --- a/src/Pointset_Ask_Tell.inlines.hh +++ b/src/Pointset_Ask_Tell.inlines.hh @@ -173,7 +173,7 @@ Pointset_Ask_Tell<PSET>::total_memory_in_bytes() const { template <typename PSET> inline int32_t Pointset_Ask_Tell<PSET>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <> diff --git a/src/Pointset_Powerset.inlines.hh b/src/Pointset_Powerset.inlines.hh index 94d787b..4076cb2 100644 --- a/src/Pointset_Powerset.inlines.hh +++ b/src/Pointset_Powerset.inlines.hh @@ -275,7 +275,7 @@ Pointset_Powerset<PSET>::total_memory_in_bytes() const { template <typename PSET> inline int32_t Pointset_Powerset<PSET>::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } template <typename PSET> diff --git a/src/Polyhedron.inlines.hh b/src/Polyhedron.inlines.hh index eacb411..ff35596 100644 --- a/src/Polyhedron.inlines.hh +++ b/src/Polyhedron.inlines.hh @@ -43,7 +43,7 @@ Polyhedron::space_dimension() const { inline int32_t Polyhedron::hash_code() const { - return space_dimension() & 0x7fffffff; + return hash_code_from_dimension(space_dimension()); } inline dimension_type diff --git a/src/globals.defs.hh b/src/globals.defs.hh index 9b59ba1..e564878 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -42,6 +42,10 @@ namespace Parma_Polyhedra_Library { dimension_type not_a_dimension(); +//! Returns the hash code for space dimension \p dim. +int32_t +hash_code_from_dimension(dimension_type dim); + #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief Make sure swap() is specialized when needed. diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index 93d2ba7..9047d1c 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -34,6 +34,12 @@ not_a_dimension() { return std::numeric_limits<dimension_type>::max(); } +inline int32_t +hash_code_from_dimension(dimension_type dim) { + const dimension_type divisor = 1U << (32 - 1); + return static_cast<int32_t>(dim % divisor); +} + inline const Weightwatch_Traits::Threshold& Weightwatch_Traits::get() { return weight;

1 0

[GIT] ppl/ppl(master): Make comparison against zero explicit.
by Enea Zaffanella 15 Feb '12

15 Feb '12

Module: ppl/ppl Branch: master Commit: 2f490ee5d25afea0c21e16463e27059223c734d0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f490ee5d25a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 15 15:43:49 2012 +0100 Make comparison against zero explicit. Detected by ECLAIR service utypflag. --- src/Float.inlines.hh | 12 ++++++------ src/Rounding_Dir.inlines.hh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index 88bb1a1..fb2b78d 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -60,7 +60,7 @@ float_ieee754_half::negate() { inline bool float_ieee754_half::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -121,7 +121,7 @@ float_ieee754_single::negate() { inline bool float_ieee754_single::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -187,7 +187,7 @@ float_ieee754_double::negate() { inline bool float_ieee754_double::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void @@ -268,7 +268,7 @@ float_ibm_single::negate() { inline bool float_ibm_single::sign_bit() const { - return !!(word & SGN_MASK); + return (word & SGN_MASK) != 0; } inline void @@ -336,7 +336,7 @@ float_intel_double_extended::negate() { inline bool float_intel_double_extended::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void @@ -416,7 +416,7 @@ float_ieee754_quad::negate() { inline bool float_ieee754_quad::sign_bit() const { - return !!(msp & MSP_SGN_MASK); + return (msp & MSP_SGN_MASK) != 0; } inline void diff --git a/src/Rounding_Dir.inlines.hh b/src/Rounding_Dir.inlines.hh index 8a4b281..af2de1c 100644 --- a/src/Rounding_Dir.inlines.hh +++ b/src/Rounding_Dir.inlines.hh @@ -70,7 +70,7 @@ round_inverse(Rounding_Dir dir) { inline bool round_strict_relation(Rounding_Dir dir) { - return dir & ROUND_STRICT_RELATION; + return (dir & ROUND_STRICT_RELATION) != 0; } #if PPL_CAN_CONTROL_FPU

1 0