- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid pointer casts when allocating coefficients in Dense_Row::Impl.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 2622a438e6d247763b436b8eeefe2c15dd9bc7f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2622a438e6d2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 14:54:20 2012 +0100 Avoid pointer casts when allocating coefficients in Dense_Row::Impl. Detected by ECLAIR service M++.5-2-8. We now use a std::allocator object (similar to what done in CO_Tree). --- src/Dense_Row.cc | 22 ++++++++-------------- src/Dense_Row.defs.hh | 4 ++++ src/Dense_Row.inlines.hh | 23 +++++++++++------------ 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 057e61b..031a57e 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -40,14 +40,12 @@ PPL::Dense_Row::resize(dimension_type new_size) { // Reallocation is required. // TODO: Consider using realloc() here. // TODO: Consider using a smarter allocation strategy. - dimension_type new_capacity = new_size; - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + const dimension_type new_capacity = new_size; + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } impl.vec = new_vec; @@ -87,27 +85,24 @@ PPL::Dense_Row::resize(dimension_type new_size, dimension_type new_capacity) { PPL_ASSERT(impl.size == new_size); - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); PPL_ASSERT(impl.vec != 0); memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); impl.vec = new_vec; impl.capacity = new_capacity; } else { if (new_capacity > capacity()) { - Coefficient* new_vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * new_capacity)); + Coefficient* new_vec = impl.coeff_allocator.allocate(new_capacity); if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } impl.vec = new_vec; @@ -163,8 +158,7 @@ void PPL::Dense_Row::init(const Sparse_Row& row) { impl.capacity = row.size(); impl.flags = row.flags(); - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * impl.capacity)); + impl.vec = impl.coeff_allocator.allocate(impl.capacity); Sparse_Row::const_iterator itr = row.begin(); Sparse_Row::const_iterator itr_end = row.end(); while (impl.size != impl.capacity) { diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index ea3d5ff..0bcbd50 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Sparse_Row.types.hh" #include "Row_Flags.defs.hh" #include "Coefficient.defs.hh" +#include <memory> #include <vector> #include <limits> @@ -393,6 +394,9 @@ private: //! The flags of this row. Row_Flags flags; + //! The allocator used to allocate/deallocate vec. + std::allocator<Coefficient> coeff_allocator; + //! The vector of coefficients. //! An empty vector may be stored as NULL instead of using a valid pointer. Coefficient* vec; diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index ba5c037..00d78d2 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -37,7 +37,7 @@ namespace Parma_Polyhedra_Library { inline Dense_Row::Impl::Impl() - : size(0), capacity(0), flags(), vec(0) { + : size(0), capacity(0), flags(), coeff_allocator(), vec(0) { } inline @@ -46,7 +46,7 @@ Dense_Row::Impl::~Impl() { --size; vec[size].~Coefficient(); } - operator delete(vec); + coeff_allocator.deallocate(vec, capacity); } inline dimension_type @@ -120,11 +120,11 @@ Dense_Row::Dense_Row(const Dense_Row& y) : impl() { impl.flags = y.flags(); + impl.coeff_allocator = y.impl.coeff_allocator; if (y.impl.vec != 0) { impl.capacity = y.capacity(); - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * impl.capacity)); + impl.vec = impl.coeff_allocator.allocate(impl.capacity); while (impl.size != y.size()) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); ++impl.size; @@ -143,10 +143,9 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(capacity <= max_size()); impl.flags = y.flags(); - - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; + impl.coeff_allocator = y.impl.coeff_allocator; + impl.vec = impl.coeff_allocator.allocate(impl.capacity); if (y.impl.vec != 0) { while (impl.size != y.size()) { @@ -171,12 +170,11 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(capacity != 0); impl.flags = y.flags(); - - impl.vec = static_cast<Coefficient*>( - operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; + impl.coeff_allocator = y.impl.coeff_allocator; + impl.vec = impl.coeff_allocator.allocate(impl.capacity); - dimension_type n = std::min(sz, y.size()); + const dimension_type n = std::min(sz, y.size()); while (impl.size != n) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); ++impl.size; @@ -199,7 +197,7 @@ Dense_Row::~Dense_Row() { inline void Dense_Row::destroy() { resize(0); - operator delete(impl.vec); + impl.coeff_allocator.deallocate(impl.vec, impl.capacity); } inline void @@ -208,6 +206,7 @@ Dense_Row::m_swap(Dense_Row& y) { swap(impl.size, y.impl.size); swap(impl.capacity, y.impl.capacity); swap(impl.flags, y.impl.flags); + swap(impl.coeff_allocator, y.impl.coeff_allocator); swap(impl.vec, y.impl.vec); PPL_ASSERT(OK()); PPL_ASSERT(y.OK());

1 0

[GIT] ppl/ppl(master): For naming consistency, `coefficient_allocator' renamed as `data_allocator'.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: b6bcf0a3f859871de9fb397308bb705a11440e38 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b6bcf0a3f859… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 14:49:04 2012 +0100 For naming consistency, `coefficient_allocator' renamed as `data_allocator'. Explicitly include <memory> for std::allocator. Fixed deallocation bugs in CO_Tree::rebuild_bigger_tree(): - use delete[] for `indexes'; - use data_allocator.deallocayte for `data'. On copy construction, assignment and swap, do also copy/assign/swap the allocator. --- src/CO_Tree.cc | 17 ++++++++--------- src/CO_Tree.defs.hh | 10 ++++++---- src/CO_Tree.inlines.hh | 16 +++++----------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 68f9fe0..fc79a0b 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -521,9 +521,9 @@ PPL::CO_Tree::init(dimension_type reserved_size1) { reserved_size = ((dimension_type)1 << max_depth) - 1; indexes = new dimension_type[reserved_size + 2]; try { - data = coefficient_allocator.allocate(reserved_size + 1); + data = data_allocator.allocate(reserved_size + 1); } catch (...) { - delete [] indexes; + delete[] indexes; throw; } // Mark all pairs as unused. @@ -549,8 +549,8 @@ PPL::CO_Tree::destroy() { data[i].~data_type(); } - delete [] indexes; - coefficient_allocator.deallocate(data, reserved_size + 1); + delete[] indexes; + data_allocator.deallocate(data, reserved_size + 1); } } @@ -704,9 +704,9 @@ PPL::CO_Tree::rebuild_bigger_tree() { data_type* new_data; try { - new_data = coefficient_allocator.allocate(new_reserved_size + 1); + new_data = data_allocator.allocate(new_reserved_size + 1); } catch (...) { - delete new_indexes; + delete[] new_indexes; throw; } @@ -724,8 +724,8 @@ PPL::CO_Tree::rebuild_bigger_tree() { new_indexes[0] = 0; new_indexes[new_reserved_size + 1] = 0; - delete [] indexes; - operator delete(data); + delete[] indexes; + data_allocator.deallocate(data, reserved_size + 1); indexes = new_indexes; data = new_data; @@ -1089,7 +1089,6 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { void PPL::CO_Tree::copy_data_from(const CO_Tree& x) { - PPL_ASSERT(size_ == 0); PPL_ASSERT(reserved_size == x.reserved_size); PPL_ASSERT(structure_OK()); diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index 2c8a5ca..4254796 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -27,6 +27,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "CO_Tree.types.hh" #include "Coefficient.defs.hh" +#include <memory> #ifndef PPL_CO_TREE_EXTRA_DEBUG #ifdef PPL_ABI_BREAKING_EXTRA_DEBUG @@ -1012,8 +1013,8 @@ private: //! Compares the fractions numer/denom with ratio/100. /*! - \returns - Returns true if the fraction numer/denom is less than the fraction ratio/100. + \returns Returns true if the fraction numer/denom is less + than the fraction ratio/100. \param ratio It must be less than or equal to 100. @@ -1279,6 +1280,9 @@ private: */ dimension_type* indexes; + //! The allocator used to allocate/deallocate data. + std::allocator<data_type> data_allocator; + //! The vector that contains the data of the keys in the tree. /*! If index[i] is \p unused_index, data[i] is unused. @@ -1299,8 +1303,6 @@ private: //! The number of values stored in the tree. dimension_type size_; - - std::allocator<Coefficient> coefficient_allocator; }; class CO_Tree::tree_iterator { diff --git a/src/CO_Tree.inlines.hh b/src/CO_Tree.inlines.hh index 546817b..50a03e7 100644 --- a/src/CO_Tree.inlines.hh +++ b/src/CO_Tree.inlines.hh @@ -46,33 +46,26 @@ CO_Tree::dfs_index(iterator itr) const { inline CO_Tree::CO_Tree() { - init(0); - PPL_ASSERT(OK()); } inline CO_Tree::CO_Tree(const CO_Tree& x) { - PPL_ASSERT(x.OK()); - + data_allocator = x.data_allocator; init(x.reserved_size); - copy_data_from(x); } inline CO_Tree& CO_Tree::operator=(const CO_Tree& x) { - if (this != &x) { - destroy(); + data_allocator = x.data_allocator; init(x.reserved_size); - copy_data_from(x); } - return *this; } @@ -178,11 +171,12 @@ CO_Tree::m_swap(CO_Tree& x) { using std::swap; swap(max_depth, x.max_depth); swap(indexes, x.indexes); + swap(data_allocator, x.data_allocator); swap(data, x.data); swap(reserved_size, x.reserved_size); swap(size_, x.size_); - // Cached iterators have been invalidated by the swap, they must be - // refreshed here. + // Cached iterators have been invalidated by the swap, + // they must be refreshed here. refresh_cached_iterators(); x.refresh_cached_iterators(); PPL_ASSERT(structure_OK());

1 0

[GIT] ppl/ppl(master): Reduce scope of loop index variable.
by Enea Zaffanella 13 Feb '12

13 Feb '12

Module: ppl/ppl Branch: master Commit: 230921583305ca2fe45f474fe7763ee238441691 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=230921583305… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 13 09:23:49 2012 +0100 Reduce scope of loop index variable. Detected by ECLAIR service minscope. --- src/Box.templates.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index e62d8df..341c111 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1920,8 +1920,7 @@ Box<ITV>::simplify_using_context_assign(const Box& y) { } // Loop index `i' is intentionally going upwards. - dimension_type i = 0; - for ( ; i < num_dims; ++i) { + for (dimension_type i = 0; i < num_dims; ++i) { if (!x.seq[i].simplify_using_context_assign(y.seq[i])) { PPL_ASSERT(!x.seq[i].is_empty()); // The intersection of `x' and `y' is empty due to the i-th interval:

1 0

[GIT] ppl/ppl(master): Make sure each case within a switch statement is properly terminated.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: ab67c65fbe7043f3d3defced489c04494909345c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab67c65fbe70… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 21:43:25 2012 +0100 Make sure each case within a switch statement is properly terminated. Detected by ECLAIR service swchbrek. --- src/BD_Shape.templates.hh | 2 ++ src/Grid_conversion.cc | 2 ++ src/Grid_public.cc | 5 +++-- src/Grid_simplify.cc | 2 ++ src/Octagonal_Shape.templates.hh | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 8b74cac..8ef7bfe 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -1512,6 +1512,8 @@ BD_Shape<T>::relation_with(const Constraint& c) const { case -1: return Poly_Con_Relation::strictly_intersects(); } + PPL_UNREACHABLE; + break; case 0: if (min_numer == 0) { if (c.is_strict_inequality()) diff --git a/src/Grid_conversion.cc b/src/Grid_conversion.cc index 0149624..2cbcee5 100644 --- a/src/Grid_conversion.cc +++ b/src/Grid_conversion.cc @@ -464,8 +464,10 @@ Grid::conversion(Congruence_System& source, Grid_Generator_System& dest, switch (dim_kinds[dim]) { case PARAMETER: dest[row].set_divisor(system_divisor); + // Intentionally fall through. case LINE: --row; + // Intentionally fall through. case GEN_VIRTUAL: break; } diff --git a/src/Grid_public.cc b/src/Grid_public.cc index 1d778b2..ad38d6e 100644 --- a/src/Grid_public.cc +++ b/src/Grid_public.cc @@ -637,7 +637,8 @@ PPL::Grid::relation_with(const Constraint& c) const { point_is_included = !c.is_equality(); break; } - // Not the first point: convert `g' to be a parameter ... + // Not the first point: convert `g' to be a parameter + // and fall through into the parameter case. Grid_Generator& gen = const_cast<Grid_Generator&>(g); const Grid_Generator& point = *first_point; const Coefficient& p_div = g[0]; @@ -658,8 +659,8 @@ PPL::Grid::relation_with(const Constraint& c) const { gen.strong_normalize(); gen.set_is_parameter(); PPL_ASSERT(gen.OK()); - // ... and fall through into the parameter case. } + // Intentionally fall through. case Grid_Generator::PARAMETER: case Grid_Generator::LINE: diff --git a/src/Grid_simplify.cc b/src/Grid_simplify.cc index 38b0807..3a08160 100644 --- a/src/Grid_simplify.cc +++ b/src/Grid_simplify.cc @@ -365,8 +365,10 @@ Grid::simplify(Grid_Generator_System& sys, Dimension_Kinds& dim_kinds) { switch (dim_kinds[dim]) { case PARAMETER: sys[row].set_divisor(system_divisor); + // Intentionally fall through. case LINE: --row; + // Intentionally fall through. case GEN_VIRTUAL: break; } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 1c47af1..27bcd0a 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1937,6 +1937,8 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { case -1: return Poly_Con_Relation::strictly_intersects(); } + PPL_UNREACHABLE; + break; case 0: if (min_numer == 0) { if (c.is_strict_inequality())

1 0

[GIT] ppl/ppl(master): Spurious spaces removed.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 723a711049fe8b07edd9781111e6394248fd3ecd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=723a711049fe… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 21:08:36 2012 +0100 Spurious spaces removed. --- src/BD_Shape.templates.hh | 40 +++++++++++++++++++------------------- src/Octagonal_Shape.templates.hh | 40 +++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 7fe9743..8b74cac 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -1470,27 +1470,27 @@ BD_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_strict_inequality() || c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } } if (!bounded_below) { max_numer += c.inhomogeneous_term() * max_denom; switch (sgn(max_numer)) { case 1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); case 0: if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } else { @@ -1501,30 +1501,30 @@ BD_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); if (c.is_strict_inequality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } case 0: if (min_numer == 0) { if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint() + return Poly_Con_Relation::is_disjoint() && Poly_Con_Relation::saturates(); - return Poly_Con_Relation::is_included() + return Poly_Con_Relation::is_included() && Poly_Con_Relation::saturates(); } if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 36338be..1c47af1 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1895,27 +1895,27 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_strict_inequality() || c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } } if (!bounded_below) { max_numer += c.inhomogeneous_term() * max_denom; switch (sgn(max_numer)) { case 1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); case 0: if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } else { @@ -1926,30 +1926,30 @@ Octagonal_Shape<T>::relation_with(const Constraint& c) const { switch (sgn(min_numer)) { case 1: if (c.is_equality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_included(); case 0: if (c.is_equality()) - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); if (c.is_strict_inequality()) - return Poly_Con_Relation::strictly_intersects(); - return Poly_Con_Relation::is_included(); + return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_included(); case -1: - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::strictly_intersects(); } case 0: if (min_numer == 0) { if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint() + return Poly_Con_Relation::is_disjoint() && Poly_Con_Relation::saturates(); - return Poly_Con_Relation::is_included() + return Poly_Con_Relation::is_included() && Poly_Con_Relation::saturates(); } if (c.is_strict_inequality()) - return Poly_Con_Relation::is_disjoint(); - return Poly_Con_Relation::strictly_intersects(); + return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::strictly_intersects(); case -1: - return Poly_Con_Relation::is_disjoint(); + return Poly_Con_Relation::is_disjoint(); } } }

1 0

[GIT] ppl/ppl(master): Type fixed.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 37b4bdd5f55204f194749a687ab97a9ef1f03fc4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37b4bdd5f552… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 19:46:43 2012 +0100 Type fixed. Detected by ECLAIR service utypflag. --- utils/timings.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/timings.cc b/utils/timings.cc index 23ba39d..20b94fd 100644 --- a/utils/timings.cc +++ b/utils/timings.cc @@ -92,7 +92,7 @@ print_clock(ostream& s) { } } assert(csecs >= 0 && csecs < 100 && secs >= 0); - int fill_char = s.fill(); + char fill_char = s.fill(); s << secs << "." << setfill('0') << setw(2) << csecs; s.fill(fill_char); }

1 0

[GIT] ppl/ppl(master): Added missing parentheses around a macro argument.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: df14c76cab47c24f88acc88c0a60dafeda066fcb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df14c76cab47… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 19:37:34 2012 +0100 Added missing parentheses around a macro argument. Detected by ECLAIR service macrbody. --- src/meta_programming.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/meta_programming.hh b/src/meta_programming.hh index 1284b09..dedb45e 100644 --- a/src/meta_programming.hh +++ b/src/meta_programming.hh @@ -120,7 +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<e>) \ + = sizeof(Parma_Polyhedra_Library::Compile_Time_Check<(e)>) \ } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(master): Avoid null statements that, apart from a comment, are not on a line by themselves.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 35c29d765b0b2acd717b13a878fed3a742f728f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35c29d765b0b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 10:24:21 2012 +0100 Avoid null statements that, apart from a comment, are not on a line by themselves. Detected by ECLAIR service nullstmt. --- src/CO_Tree.cc | 2 +- src/MIP_Problem.cc | 2 +- src/globals.defs.hh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index bf45dec..68f9fe0 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -786,7 +786,7 @@ PPL::CO_Tree::rebalance(tree_iterator itr, dimension_type key, subtree_reserved_size = 2*subtree_reserved_size + 1; --itr_depth_minus_1; PPL_ASSERT(itr.depth() - 1 == itr_depth_minus_1); - }; + } // Now the subtree rooted at itr has been chosen as the subtree to be // rebalanced. diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index c777be6..e3ad951 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -685,7 +685,7 @@ PPL::MIP_Problem::process_pending_constraints() { is_remergeable_variable)) { status = UNSATISFIABLE; return false; - }; + } // Merge back any variable that was previously split into a positive // and a negative part and is now known to be nonnegative. diff --git a/src/globals.defs.hh b/src/globals.defs.hh index d30a292..9b59ba1 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -155,7 +155,9 @@ extern unsigned int in_assert; wp__.end(factor); \ } while(0) #else -#define WEIGHT_BEGIN() +#define WEIGHT_BEGIN() \ + do { \ + } while(0) #define WEIGHT_ADD(delta) \ do { \ Weightwatch_Traits::weight += (delta); \

1 0

[GIT] ppl/ppl(master): Updated.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 4f263321dba7e0865cd234aa0ed69a716b13c688 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4f263321dba7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 09:10:15 2012 +0100 Updated. --- Watchdog/compile | 33 +++--- Watchdog/config.guess | 50 ++++++---- Watchdog/config.sub | 102 ++++++++++++------ Watchdog/depcomp | 74 ++++++++++++-- Watchdog/install-sh | 23 +++-- Watchdog/ltmain.sh | 95 ++++++++++------- Watchdog/m4/libtool.m4 | 265 ++++++++++++++++++++++++++++++++++++---------- Watchdog/m4/ltoptions.m4 | 19 +++- Watchdog/m4/ltversion.m4 | 10 +- Watchdog/missing | 53 +--------- compile | 33 +++--- config.guess | 50 ++++++---- config.sub | 102 ++++++++++++------ depcomp | 74 ++++++++++++-- install-sh | 23 +++-- ltmain.sh | 95 ++++++++++------- m4/libtool.m4 | 265 ++++++++++++++++++++++++++++++++++++---------- m4/ltoptions.m4 | 19 +++- m4/ltversion.m4 | 10 +- missing | 53 +--------- 20 files changed, 970 insertions(+), 478 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=4f263321…

1 0

[GIT] ppl/ppl(master): Prolog sources must go under .../share/ ppl as these files are architecture independent.
by Roberto Bagnara 12 Feb '12

12 Feb '12

Module: ppl/ppl Branch: master Commit: 10e0afa8fa25c9e0e8eaac9a0d730ab325086010 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10e0afa8fa25… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 12 08:48:59 2012 +0100 Prolog sources must go under .../share/ppl as these files are architecture independent. Moreover, new versions of Automake no longer accept pkglib_DATA. --- interfaces/Prolog/Ciao/Makefile.am | 2 +- interfaces/Prolog/GNU/Makefile.am | 2 +- interfaces/Prolog/SICStus/Makefile.am | 4 ++-- interfaces/Prolog/SWI/Makefile.am | 2 +- interfaces/Prolog/XSB/Makefile.am | 2 +- interfaces/Prolog/YAP/Makefile.am | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index c8dd56e..8dcf17e 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -170,7 +170,7 @@ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version -pkglib_DATA = ppl_ciao.po +pkgdata_DATA = ppl_ciao.po ppl_ciao.pl: $(interface_generator_dependencies) $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index 5904bf1..2ba45ee 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -169,7 +169,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies) $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@ -pkglib_DATA = ppl_gprolog.pl +pkgdata_DATA = ppl_gprolog.pl bin_PROGRAMS = ppl_gprolog diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index 17a54c7..22f809f 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -69,7 +69,7 @@ ppl_sicstus_SOURCES = if ENABLE_SHARED -pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o +pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la $(LIBTOOL) --mode=link --tag=CXX \ @@ -87,7 +87,7 @@ install-data-local: ppl_sicstus.so else !ENABLE_SHARED -pkglib_DATA = ppl_sicstus.pl +pkgdata_DATA = ppl_sicstus.pl endif !ENABLE_SHARED diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index f5bcbe8..5e4e0e4 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -189,7 +189,7 @@ $(NO_UNDEFINED_FLAG) \ bin_PROGRAMS = ppl_pl ppl_pl_SOURCES = ppl_pl.cc -pkglib_DATA = ppl_swiprolog.pl +pkgdata_DATA = ppl_swiprolog.pl CLPQ_TESTS_NONSTRICT = \ ack.clpq \ diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index 18648eb..1bc1e67 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version -pkglib_DATA = ppl_xsb.xwam +pkgdata_DATA = ppl_xsb.xwam ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la cp -f ppl_xsb.cc ppl_xsb.c diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index fab59c2..34d89e9 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -179,7 +179,7 @@ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version -pkglib_DATA = ppl_yap.pl +pkgdata_DATA = ppl_yap.pl CLPQ_TESTS_NONSTRICT = \ ack.clpq \

1 0