February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Restore previous names.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 1b647baaca8ae93381e8579ac7ca157af0d433ac URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b647baaca8a… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 22:42:44 2012 +0100 Restore previous names. --- src/Octagonal_Shape.templates.hh | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 84dc855..7dfea5b 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -4431,8 +4431,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, minus_coeff_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -4618,8 +4618,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w_id' can be disregarded, as they all have // a zero coefficient in `expr'. - for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_Iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_Reference m_i = *m_iter; @@ -4702,8 +4702,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, coeff_i); PPL_DIRTY_TEMP(N, approx_i); PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); - for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_Iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_Reference m_i = *m_iter; @@ -4999,8 +4999,8 @@ Octagonal_Shape<T>::affine_image(const Variable var, // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. const Row_Iterator m_begin = matrix.row_begin(); - for (Row_iterator m_iter = m_begin, - m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { + for (Row_iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -5933,8 +5933,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6027,8 +6027,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); PPL_DIRTY_TEMP(N, approx_i); // Approximate the homogeneous part of `-sc_expr'. - for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6493,8 +6493,8 @@ Octagonal_Shape<T>::bounded_affine_image(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); - m_iter != m_end; ) { + for (Row_iterator m_iter = m_begin, m_iter_end = m_begin + (2 * w_id + 2); + m_iter != m_iter_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter;

1 0

[GIT] ppl/ppl(master): Use "" quotes to include non-system headers.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: d1113c510bef0d225dc673e31ed4df18ab5c4749 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d1113c510bef… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 21:12:15 2012 +0100 Use "" quotes to include non-system headers. Detected by ECLAIR service hedrname. --- src/Threshold_Watcher.cc | 3 +-- src/Time.cc | 3 +-- src/Watchdog.cc | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Threshold_Watcher.cc b/src/Threshold_Watcher.cc index 9652c0e..70a0a2c 100644 --- a/src/Threshold_Watcher.cc +++ b/src/Threshold_Watcher.cc @@ -22,7 +22,6 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <ppl-config.h> - +#include "ppl-config.h" #include "Threshold_Watcher.defs.hh" diff --git a/src/Time.cc b/src/Time.cc index 47568aa..213df40 100644 --- a/src/Time.cc +++ b/src/Time.cc @@ -21,8 +21,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <ppl-config.h> - +#include "ppl-config.h" #include "Time.defs.hh" namespace PPL = Parma_Polyhedra_Library; diff --git a/src/Watchdog.cc b/src/Watchdog.cc index b038e88..db789a8 100644 --- a/src/Watchdog.cc +++ b/src/Watchdog.cc @@ -21,8 +21,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <ppl-config.h> - +#include "ppl-config.h" #include "Watchdog.defs.hh" #if PPL_HAVE_DECL_SETITIMER && PPL_HAVE_DECL_SIGACTION

1 0

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

24 Feb '12

Module: ppl/ppl Branch: master Commit: 4b09274909915d1908c5a0668390286604a2bda7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4b0927490991… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 21:10:28 2012 +0100 Comments improved. --- src/BD_Shape.templates.hh | 26 ++++++++++++++------------ src/Polyhedron_chdims.cc | 4 ++-- src/simplify.cc | 7 ++++--- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 3d4e132..6bd8c72 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -597,24 +597,26 @@ BD_Shape<T>::contains(const BD_Shape& y) const { } /* - The `y' bounded difference shape need be closed. - In fact if, for example, in `*this' we have the constraints: + The `y' bounded difference shape must be closed. As an example, + consider the case where in `*this' we have the constraints - x1 - x2 <= 1; - x1 <= 3; - x2 <= 2; + x1 - x2 <= 1, + x1 <= 3, + x2 <= 2, - in `y' the constraints are: + and in `y' the constraints are - x1 - x2 <= 0; - x2 <= 1; + x1 - x2 <= 0, + x2 <= 1. - without closure it returns "false", instead if we close `y' we have - the implicit constraint + Without closure the (erroneous) analysis of the inhomogeneous terms + would conclude containment does not hold. Closing `y' results into + the "discovery" of the implicit constraint - x1 <= 1; + x1 <= 1, - and so we obtain the right result "true". + at which point the inhomogeneous terms can be examined to determine + that containment does hold. */ y.shortest_path_closure_assign(); diff --git a/src/Polyhedron_chdims.cc b/src/Polyhedron_chdims.cc index e4eabda..1ef2024 100644 --- a/src/Polyhedron_chdims.cc +++ b/src/Polyhedron_chdims.cc @@ -229,7 +229,7 @@ PPL::Polyhedron::add_space_dimensions_and_project(dimension_type m) { // In contrast, in the system of constraints, new rows are needed // in order to avoid embedding the old polyhedron in the new space. // Thus, for each new dimensions `x[k]', we add the constraint - // x[k] = 0; this is done by invoking the function add_space_dimensions() + // x[k] = 0: this is done by invoking the function add_space_dimensions() // giving the system of constraints as the second argument. if (constraints_are_up_to_date()) if (generators_are_up_to_date()) { @@ -237,7 +237,7 @@ PPL::Polyhedron::add_space_dimensions_and_project(dimension_type m) { if (!sat_g_is_up_to_date()) update_sat_g(); // Adds rows and/or columns to both matrices. - // `add_space_dimensions' correctly handles pending constraints + // `add_space_dimensions()' correctly handles pending constraints // or generators. add_space_dimensions(gen_sys, con_sys, sat_g, sat_c, m); } diff --git a/src/simplify.cc b/src/simplify.cc index 46b7f2a..cdda027 100644 --- a/src/simplify.cc +++ b/src/simplify.cc @@ -192,11 +192,12 @@ PPL::Polyhedron::simplify(Linear_System& sys, Bit_Matrix& sat) { // condition for an inequality to be irredundant (i.e., it provides // a sufficient condition for identifying redundant inequalities). // Let - // num_saturators[i] = num_sat_lines[i] + num_sat_rays_or_points[i]; - // dim_lin_space = num_irredundant_lines; + // + // num_saturators[i] = num_sat_lines[i] + num_sat_rays_or_points[i], + // dim_lin_space = num_irredundant_lines, // dim_ray_space // = dim_vector_space - num_irredundant_equalities - dim_lin_space - // = num_columns - 1 - num_lines_or_equalities - dim_lin_space; + // = num_columns - 1 - num_lines_or_equalities - dim_lin_space, // min_sat_rays_or_points = dim_ray_space. // // An inequality saturated by less than `dim_ray_space' _rays/points_

1 0

[GIT] ppl/ppl(master): Avoid commented-out code.
by Roberto Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 5155daa681e19cb6bede5c899860cade0ac18174 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5155daa681e1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 19:57:30 2012 +0100 Avoid commented-out code. Detected by ECLAIR service cmntdout. --- src/Checked_Number.defs.hh | 21 +++++++++++---------- src/WRD_coefficient_types.defs.hh | 34 ++++++++++++++-------------------- src/checked.inlines.hh | 10 +++++----- 3 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh index 0bf4a5f..d7bad52 100644 --- a/src/Checked_Number.defs.hh +++ b/src/Checked_Number.defs.hh @@ -46,18 +46,19 @@ struct Extended_Number_Policy { const_bool_nodef(check_sqrt_neg, false); const_bool_nodef(has_nan, true); const_bool_nodef(has_infinity, true); - // Do not uncomment the following. - // The compile time error on conversions is the expected behavior. - // const_bool_nodef(convertible, false); + + // `convertible' is intentionally not defined: the compile time + // error on conversions is the expected behavior. + const_bool_nodef(fpu_check_inexact, true); const_bool_nodef(fpu_check_nan_result, true); - // Do not uncomment the following. - // The compile time error is the expected behavior. - // static const Rounding_Dir ROUND_DEFAULT_CONSTRUCTOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OPERATOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_FUNCTION = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_INPUT = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OUTPUT = ROUND_UP; + + // ROUND_DEFAULT_CONSTRUCTOR is intentionally not defined. + // ROUND_DEFAULT_OPERATOR is intentionally not defined. + // ROUND_DEFAULT_FUNCTION is intentionally not defined. + // ROUND_DEFAULT_INPUT is intentionally not defined. + // ROUND_DEFAULT_OUTPUT is intentionally not defined. + static void handle_result(Result r); }; diff --git a/src/WRD_coefficient_types.defs.hh b/src/WRD_coefficient_types.defs.hh index 52df272..7c1e23e 100644 --- a/src/WRD_coefficient_types.defs.hh +++ b/src/WRD_coefficient_types.defs.hh @@ -65,9 +65,8 @@ struct WRD_Extended_Number_Policy { //! Handle infinity special values. const_bool_nodef(has_infinity, true); - // Do not uncomment the following. - // The compile time error on conversions is the expected behavior. - // const_bool_nodef(convertible, false); + // `convertible' is intentionally not defined: the compile time + // error on conversions is the expected behavior. //! Honor requests to check for FPU inexact results. const_bool_nodef(fpu_check_inexact, true); @@ -75,13 +74,11 @@ struct WRD_Extended_Number_Policy { //! Do not make extra checks to detect FPU NaN results. const_bool_nodef(fpu_check_nan_result, false); - // Do not uncomment the following. - // The compile time error is the expected behavior. - // static const Rounding_Dir ROUND_DEFAULT_CONSTRUCTOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OPERATOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_FUNCTION = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_INPUT = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OUTPUT = ROUND_UP; + // ROUND_DEFAULT_CONSTRUCTOR is intentionally not defined. + // ROUND_DEFAULT_OPERATOR is intentionally not defined. + // ROUND_DEFAULT_FUNCTION is intentionally not defined. + // ROUND_DEFAULT_INPUT is intentionally not defined. + // ROUND_DEFAULT_OUTPUT is intentionally not defined. /*! \brief Handles \p r: called by all constructors, operators and functions that @@ -127,9 +124,8 @@ struct Debug_WRD_Extended_Number_Policy { //! Handle infinity special values. const_bool_nodef(has_infinity, true); - // Do not uncomment the following. - // The compile time error on conversions is the expected behavior. - // const_bool_nodef(convertible, false); + // `convertible' is intentionally not defined: the compile time + // error on conversions is the expected behavior. //! Honor requests to check for FPU inexact results. const_bool_nodef(fpu_check_inexact, true); @@ -137,13 +133,11 @@ struct Debug_WRD_Extended_Number_Policy { //! Make extra checks to detect FPU NaN results. const_bool_nodef(fpu_check_nan_result, true); - // Do not uncomment the following. - // The compile time error is the expected behavior. - // static const Rounding_Dir ROUND_DEFAULT_CONSTRUCTOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OPERATOR = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_FUNCTION = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_INPUT = ROUND_UP; - // static const Rounding_Dir ROUND_DEFAULT_OUTPUT = ROUND_UP; + // ROUND_DEFAULT_CONSTRUCTOR is intentionally not defined. + // ROUND_DEFAULT_OPERATOR is intentionally not defined. + // ROUND_DEFAULT_FUNCTION is intentionally not defined. + // ROUND_DEFAULT_INPUT is intentionally not defined. + // ROUND_DEFAULT_OUTPUT is intentionally not defined. /*! \brief Handles \p r: called by all constructors, operators and functions that diff --git a/src/checked.inlines.hh b/src/checked.inlines.hh index bf91e75..44eea27 100644 --- a/src/checked.inlines.hh +++ b/src/checked.inlines.hh @@ -222,27 +222,27 @@ PPL_SAFE_CONVERSION(mpz_class, signed char); PPL_SAFE_CONVERSION(mpz_class, signed short); PPL_SAFE_CONVERSION(mpz_class, signed int); PPL_SAFE_CONVERSION(mpz_class, signed long); -//PPL_SAFE_CONVERSION(mpz_class, signed long long); +// GMP's API does not support signed long long. PPL_SAFE_CONVERSION(mpz_class, unsigned char); PPL_SAFE_CONVERSION(mpz_class, unsigned short); PPL_SAFE_CONVERSION(mpz_class, unsigned int); PPL_SAFE_CONVERSION(mpz_class, unsigned long); -//PPL_SAFE_CONVERSION(mpz_class, unsigned long long); +// GMP's API does not support unsigned long long. PPL_SAFE_CONVERSION(mpq_class, char); PPL_SAFE_CONVERSION(mpq_class, signed char); PPL_SAFE_CONVERSION(mpq_class, signed short); PPL_SAFE_CONVERSION(mpq_class, signed int); PPL_SAFE_CONVERSION(mpq_class, signed long); -//PPL_SAFE_CONVERSION(mpq_class, signed long long); +// GMP's API does not support signed long long. PPL_SAFE_CONVERSION(mpq_class, unsigned char); PPL_SAFE_CONVERSION(mpq_class, unsigned short); PPL_SAFE_CONVERSION(mpq_class, unsigned int); PPL_SAFE_CONVERSION(mpq_class, unsigned long); -//PPL_SAFE_CONVERSION(mpq_class, unsigned long long); +// GMP's API does not support unsigned long long. PPL_SAFE_CONVERSION(mpq_class, float); PPL_SAFE_CONVERSION(mpq_class, double); -//PPL_SAFE_CONVERSION(mpq_class, long double); +// GMP's API does not support long double. #undef PPL_SAFE_CONVERSION

1 0

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

24 Feb '12

Module: ppl/ppl Branch: master Commit: 5161145cfadb50f9c441a4fc41fecf441483918e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5161145cfadb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Feb 24 19:57:23 2012 +0100 Comments improved. --- src/Polyhedron_nonpublic.cc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index dba2518..2516b2a 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1460,7 +1460,8 @@ PPL::Polyhedron::BHZ09_C_poly_hull_assign_if_exact(const Polyhedron& y) { // Minimization is not really required, but it is probably the best // way of getting constraints, generators and saturation matrices - // up-to-date; it also removes redundant constraints/generators. + // up-to-date. Minimization it also removes redundant + // constraints/generators. (void) x.minimize(); (void) y.minimize(); @@ -1563,7 +1564,8 @@ PPL::Polyhedron::BHZ09_NNC_poly_hull_assign_if_exact(const Polyhedron& y) { // Minimization is not really required, but it is probably the best // way of getting constraints, generators and saturation matrices - // up-to-date; it also removes redundant constraints/generators. + // up-to-date. Minimization also removes redundant + // constraints/generators. (void) x.minimize(); (void) y.minimize();

1 0

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

24 Feb '12

Module: ppl/ppl Branch: master Commit: 9fd12191d4f7912e12b5f3965be1b69a52787d04 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9fd12191d4f7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 16:55:58 2012 +0100 Avoid implicit conversion changing type signedness. Detected by ECLAIR service utypflag. --- src/Octagonal_Shape.templates.hh | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index a18e48f..84dc855 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -3403,10 +3403,12 @@ Octagonal_Shape<T>::remove_space_dimensions(const Variables_Set& vars) { // We consider each variable and we check if it has to be removed. // If it has to be removed, we pass to the next one, then we will // overwrite its representation in the matrix. + typedef typename OR_Matrix<N>::element_iterator Elem_Iter; + typedef typename std::iterator_traits<Elem_Iter>::difference_type diff_t; + dimension_type first = *vars.begin(); - dimension_type first_size = 2*first*(first + 1); - typename OR_Matrix<N>::element_iterator - iter = matrix.element_begin() + first_size; + const dimension_type first_size = 2 * first * (first + 1); + Elem_Iter iter = matrix.element_begin() + static_cast<diff_t>(first_size); for (dimension_type i = first + 1; i < space_dim; ++i) { if (vars.count(i) == 0) {

1 0

[GIT] ppl/ppl(master): Fixed C interface incongruence.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 1ff76cad0788fa1893f40f32257dcd3c732f2319 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ff76cad0788… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 16:52:41 2012 +0100 Fixed C interface incongruence. Detected by ECLAIR service utypflag. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 3bf5ce3..43d971e 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -758,7 +758,7 @@ m4_define(`ppl_@CLASS@_BGP99_@DISJUNCT_WIDEN@_extrapolation_assign_code', ppl_@CLASS@_BGP99_@DISJUNCT_WIDEN@_extrapolation_assign (ppl_@CLASS@_t x, ppl_const_@CLASS@_t y, - int disjuncts) try { + unsigned disjuncts) try { @CPP_CLASS@& xx = *to_nonconst(x); const @CPP_CLASS@& yy = *to_const(y); xx.BGP99_extrapolation_assign(yy,

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion changing signedness.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 7cfc3f1609b01c51c1a402012bb313a95f847e61 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7cfc3f1609b0… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 16:52:21 2012 +0100 Avoid implicit conversion changing signedness. Detected by ECLAIR service utypflag. --- interfaces/C/ppl_c_implementation_common.cc | 12 ++++++------ interfaces/C/ppl_interface_generator_c_cc_code.m4 | 2 +- src/checked_float.inlines.hh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index ee8a2eb..f5a6eac 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -306,25 +306,25 @@ CATCH_ALL int ppl_version_major(void) try { - return version_major(); + return static_cast<int>(version_major()); } CATCH_ALL int ppl_version_minor(void) try { - return version_minor(); + return static_cast<int>(version_minor()); } CATCH_ALL int ppl_version_revision(void) try { - return version_revision(); + return static_cast<int>(version_revision()); } CATCH_ALL int ppl_version_beta(void) try { - return version_beta(); + return static_cast<int>(version_beta()); } CATCH_ALL @@ -1903,7 +1903,7 @@ int ppl_MIP_Problem_number_of_constraints(ppl_const_MIP_Problem_t mip, ppl_dimension_type* m) try { const MIP_Problem& mmip = *to_const(mip); - *m = mmip.constraints_end() - mmip.constraints_begin(); + *m = static_cast<ppl_dimension_type>(mmip.constraints_end() - mmip.constraints_begin()); return 0; } CATCH_ALL @@ -2188,7 +2188,7 @@ int ppl_PIP_Problem_number_of_constraints(ppl_const_PIP_Problem_t pip, ppl_dimension_type* m) try { const PIP_Problem& ppip = *to_const(pip); - *m = ppip.constraints_end() - ppip.constraints_begin(); + *m = static_cast<ppl_dimension_type>(ppip.constraints_end() - ppip.constraints_begin()); return 0; } CATCH_ALL diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index ec24f9c..3bf5ce3 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -184,7 +184,7 @@ ppl_@CLASS@_relation_with_@!RELATION_REPRESENT@ ppl_const_@!RELATION_REPRESENT@_t c) try { const @CPP_CLASS@& pph = *to_const(ph); const @!RELATION_REPRESENT@& cc = *to_const(c); - return pph.relation_with(cc).get_flags(); + return static_cast<int>(pph.relation_with(cc).get_flags()); } CATCH_ALL diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index ae6373f..79166c0 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -840,7 +840,7 @@ assign_float_mpz(T& to, const mpz_class& from, Rounding_Dir dir) { else mpz_mul_2exp(mantissa, from_z, Float<T>::Binary::MANTISSA_BITS - exponent); Float<T> f; - f.u.binary.build(sign < 0, mantissa, exponent); + f.u.binary.build(sign < 0, mantissa, static_cast<long>(exponent)); mpz_clear(mantissa); to = f.value(); if (meaningful_bits > Float<T>::Binary::MANTISSA_BITS) {

1 0

[GIT] ppl/ppl(master): Added any_iterator operator+= and operator+ overloadings for unsigned types.
by Enea Zaffanella 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 4abb9c3094dc31615447801e02e71ac6c4af1ff4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4abb9c3094dc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 24 16:09:55 2012 +0100 Added any_iterator operator+= and operator+ overloadings for unsigned types. --- src/OR_Matrix.defs.hh | 10 ++++++++++ src/OR_Matrix.inlines.hh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/OR_Matrix.defs.hh b/src/OR_Matrix.defs.hh index 0c7f137..f70dca1 100644 --- a/src/OR_Matrix.defs.hh +++ b/src/OR_Matrix.defs.hh @@ -253,6 +253,11 @@ private: //! Assignment-increment operator. any_row_iterator& operator+=(difference_type m); + //! Assignment-increment operator for \p m of unsigned type. + template <typename Unsigned> + typename Enable_If<(static_cast<Unsigned>(-1) > 0), any_row_iterator&>::type + operator+=(Unsigned m); + //! Assignment-decrement operator. any_row_iterator& operator-=(difference_type m); @@ -262,6 +267,11 @@ private: //! Returns the sum of \p *this and \p m. any_row_iterator operator+(difference_type m) const; + //! Returns the sum of \p *this and \p m, for \p m of unsigned type. + template <typename Unsigned> + typename Enable_If<(static_cast<Unsigned>(-1) > 0), any_row_iterator>::type + operator+(Unsigned m) const; + //! Returns the difference of \p *this and \p m. any_row_iterator operator-(difference_type m) const; diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 448bc0b..7a20e71 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -257,6 +257,25 @@ OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { template <typename T> template <typename U> +template <typename Unsigned> +inline typename +Enable_If<(static_cast<Unsigned>(-1) > 0), + typename OR_Matrix<T>::template any_row_iterator& >::type +OR_Matrix<T>::any_row_iterator::operator+=(Unsigned m) { + dimension_type increment = m + m * m / 2 + m * e; + if (e % 2 == 0 && m % 2 != 0) + ++increment; + e += m; + i += increment; + value.first += increment; +#if PPL_OR_MATRIX_EXTRA_DEBUG + value.size_ = value.size_ + m - m % 2; +#endif + return *this; +} + +template <typename T> +template <typename U> inline typename OR_Matrix<T>::template any_row_iterator& OR_Matrix<T>::any_row_iterator::operator-=(difference_type m) { return *this += -m; @@ -280,6 +299,18 @@ OR_Matrix<T>::any_row_iterator::operator+(difference_type m) const { template <typename T> template <typename U> +template <typename Unsigned> +inline typename +Enable_If<(static_cast<Unsigned>(-1) > 0), + typename OR_Matrix<T>::template any_row_iterator >::type +OR_Matrix<T>::any_row_iterator::operator+(Unsigned m) const { + any_row_iterator r = *this; + r += m; + return r; +} + +template <typename T> +template <typename U> inline typename OR_Matrix<T>::template any_row_iterator OR_Matrix<T>::any_row_iterator::operator-(const difference_type m) const { any_row_iterator r = *this;

1 0

[GIT] ppl/ppl(master): Avoid to offset iterators twice.
by Abramo Bagnara 24 Feb '12

24 Feb '12

Module: ppl/ppl Branch: master Commit: 96b0c536a8dcd3cf29759452003bca3172d7509c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=96b0c536a8dc… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri Feb 24 15:39:01 2012 +0100 Avoid to offset iterators twice. --- src/Octagonal_Shape.templates.hh | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index b029054..a18e48f 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -4429,8 +4429,8 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, minus_coeff_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -4616,7 +4616,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w_id' can be disregarded, as they all have // a zero coefficient in `expr'. - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4700,7 +4700,7 @@ Octagonal_Shape<T>::refine(const Variable var, PPL_DIRTY_TEMP(N, coeff_i); PPL_DIRTY_TEMP(N, approx_i); PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); - for (Row_Iterator m_iter = m_begin, m_end = m_iter + (2*w_id) + 2; + for (Row_Iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; @@ -4998,7 +4998,7 @@ Octagonal_Shape<T>::affine_image(const Variable var, // a zero coefficient in `sc_expr'. const Row_Iterator m_begin = matrix.row_begin(); for (Row_iterator m_iter = m_begin, - m_iter_end = m_iter + (2*w_id) + 2; m_iter != m_iter_end; ) { + m_end = m_begin + (2 * w_id + 2); m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -5931,8 +5931,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6025,8 +6025,8 @@ Octagonal_Shape<T> PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); PPL_DIRTY_TEMP(N, approx_i); // Approximate the homogeneous part of `-sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter; @@ -6491,8 +6491,8 @@ Octagonal_Shape<T>::bounded_affine_image(const Variable var, PPL_DIRTY_TEMP_COEFFICIENT(minus_sc_i); // Note: indices above `w' can be disregarded, as they all have // a zero coefficient in `sc_expr'. - for (Row_iterator m_iter = m_begin, m_iter_end = m_iter + (2*w_id) + 2; - m_iter != m_iter_end; ) { + for (Row_iterator m_iter = m_begin, m_end = m_begin + (2 * w_id + 2); + m_iter != m_end; ) { const dimension_type n_i = m_iter.index(); const dimension_type id = n_i/2; Row_reference m_i = *m_iter;

1 0