- PPL-devel - BUGSENG Mailman

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

22 Feb '12

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

1 0

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

22 Feb '12

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

1 0

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

22 Feb '12

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

1 0

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

22 Feb '12

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

1 0

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

22 Feb '12

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

1 0

[GIT] ppl/ppl(master): Uniformed, improved and moved to a better place implementation of clz/ctz.
by Abramo Bagnara 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 754dcbd68b32c262d39d7d5dba3ed01a9f816b6c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=754dcbd68b32… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Feb 22 13:17:14 2012 +0100 Uniformed, improved and moved to a better place implementation of clz/ctz. --- src/Bit_Row.inlines.hh | 118 +++---------------------------------- src/Float.inlines.hh | 34 +----------- src/assert.hh | 2 - src/compiler.hh | 149 ++++++++++++++++++++++++++++++++++++++++++++++++ src/globals.inlines.hh | 3 +- 5 files changed, 162 insertions(+), 144 deletions(-) diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh index 0fb51b7..50e919c 100644 --- a/src/Bit_Row.inlines.hh +++ b/src/Bit_Row.inlines.hh @@ -24,6 +24,7 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Bit_Row_inlines_hh #define PPL_Bit_Row_inlines_hh 1 +#include "compiler.hh" #include "globals.defs.hh" #include "assert.hh" @@ -160,15 +161,12 @@ Bit_Row::difference_assign(const Bit_Row& x, const Bit_Row& y) { namespace Implementation { -#if defined(__GNUC__) - /*! \brief Assuming \p u is nonzero, returns the index of the first set bit in \p u. */ inline unsigned int first_one(unsigned int u) { - PPL_ASSERT(u != 0); - return __builtin_ctz(u); + return ctz(u); } /*! \brief @@ -177,8 +175,7 @@ first_one(unsigned int u) { */ inline unsigned int first_one(unsigned long ul) { - PPL_ASSERT(ul != 0); - return __builtin_ctzl(ul); + return ctz(ul); } /*! \brief @@ -187,65 +184,16 @@ first_one(unsigned long ul) { */ inline unsigned int first_one(unsigned long long ull) { - PPL_ASSERT(ull != 0); - return __builtin_ctzll(ull); -} - -#elif PPL_HAVE_DECL_FFS && PPL_SIZEOF_MP_LIMB_T == PPL_SIZEOF_INT - -/*! \brief - Assuming \p w is nonzero, returns the index of the first set bit in \p w. -*/ -inline unsigned int -first_one(mp_limb_t w) { - return ffs(w)-1; -} - -#else - -/*! \brief - Assuming \p w is nonzero, returns the index of the first set bit in \p w. -*/ -inline unsigned int -first_one(mp_limb_t w) { - unsigned int r = 0; - w = w & -w; -#if PPL_SIZEOF_MP_LIMB_T == 8 - if ((w & 0xffffffff) == 0) { - w >>= 32; - r += 32; - } -#elif PPL_SIZEOF_MP_LIMB_T != 4 -#error "size of mp_limb_t not supported by first_one(mp_limb_t w)." -#endif - if ((w & 0xffff) == 0) { - w >>= 16; - r += 16; - } - if ((w & 0xff) == 0) { - w >>= 8; - r += 8; - } - if (w & 0xf0) - r += 4; - if (w & 0xcc) - r += 2; - if (w & 0xaa) - r += 1; - return r; + return ctz(ull); } -#endif // !defined(__GNUC__) - // && (!PPL_HAVE_DECL_FFS || PPL_SIZEOF_MP_LIMB_T != PPL_SIZEOF_INT) - -#if defined(__GNUC__) /*! \brief Assuming \p u is nonzero, returns the index of the last set bit in \p u. */ inline unsigned int last_one(unsigned int u) { - PPL_ASSERT(u != 0); - return sizeof(unsigned int)*CHAR_BIT - 1 - __builtin_clz(u); + return static_cast<unsigned int>(sizeof_to_bits(sizeof(u))) + - 1U - clz(u); } /*! \brief @@ -254,8 +202,8 @@ last_one(unsigned int u) { */ inline unsigned int last_one(unsigned long ul) { - PPL_ASSERT(ul != 0); - return sizeof(unsigned long)*CHAR_BIT - 1 - __builtin_clzl(ul); + return static_cast<unsigned int>(sizeof_to_bits(sizeof(ul))) + - 1U - clz(ul); } /*! \brief @@ -264,56 +212,10 @@ last_one(unsigned long ul) { */ inline unsigned int last_one(unsigned long long ull) { - PPL_ASSERT(ull != 0); - return sizeof(unsigned long long)*CHAR_BIT - 1 - __builtin_clzll(ull); -} - -#else // !defined(__GNUC__) - -/*! \brief - Assuming \p w is nonzero, returns the index of the last set bit in \p w. -*/ -inline unsigned int -last_one(mp_limb_t w) { - PPL_ASSERT(w != 0); - unsigned int r = 0; -#if PPL_SIZEOF_MP_LIMB_T == 8 - if (w & -#if PPL_SIZEOF_LONG == 8 - 0xffffffff00000000 -#else - 0xffffffff00000000LL -#endif - ) { - w >>= 32; - r += 32; - } -#elif PPL_SIZEOF_MP_LIMB_T != 4 -#error "size of mp_limb_t not supported by last_one(mp_limb_t w)." -#endif - if (w & 0xffff0000) { - w >>= 16; - r += 16; - } - if (w & 0xff00) { - w >>= 8; - r += 8; - } - if (w & 0xf0) { - w >>= 4; - r += 4; - } - if (w & 0xc) { - w >>= 2; - r += 2; - } - if (w & 0x2) - r += 1; - return r; + return static_cast<unsigned int>(sizeof_to_bits(sizeof(ull))) + - 1U - clz(ull); } -#endif // !defined(__GNUC__) - } // namespace Implementation /*! \relates Bit_Row */ diff --git a/src/Float.inlines.hh b/src/Float.inlines.hh index 6d851db..ce371e0 100644 --- a/src/Float.inlines.hh +++ b/src/Float.inlines.hh @@ -466,42 +466,10 @@ is_less_precise_than(Floating_Point_Format f1, Floating_Point_Format f2) { return f1 < f2; } -#if defined(__GNUC__) inline unsigned int msb_position(unsigned long long v) { - PPL_ASSERT(v != 0); - return static_cast<unsigned>(__builtin_clzll(v)) ^ (sizeof(v)*8 - 1); + return static_cast<unsigned int>(sizeof_to_bits(sizeof(v))) - 1U - clz(v); } -#else -unsigned int -msb_position(unsigned long long v) { - PPL_ASSERT(v != 0); - unsigned r = 0; - if (v >= 0x100000000ULL) { - v >>= 32; - r += 32; - } - if (v >= 0x10000) { - v >>= 16; - r += 16; - } - if (v >= 0x100) { - v >>= 8; - r += 8; - } - if (v >= 0x10) { - v >>= 4; - r += 4; - } - if (v >= 4) { - v >>= 2; - r += 2; - } - if (v >= 2) - r++; - return r; -} -#endif template <typename FP_Interval_Type> inline void diff --git a/src/assert.hh b/src/assert.hh index 29b103b..09c84a1 100644 --- a/src/assert.hh +++ b/src/assert.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_assert_hh #define PPL_assert_hh 1 -#include "globals.defs.hh" - // The PPL_UNREACHABLE_MSG macro flags a program point as unreachable. // Argument `msg__' is added to output when assertions are turned on. #if defined(NDEBUG) diff --git a/src/compiler.hh b/src/compiler.hh index eb34db2..7544710 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -24,6 +24,11 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_compiler_hh #define PPL_compiler_hh 1 +#include "assert.hh" + +#include <cstddef> +#include <climits> + namespace Parma_Polyhedra_Library { #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS @@ -73,6 +78,150 @@ struct Suppress_Uninitialized_Warnings_Type { type name #endif +inline std::size_t +sizeof_to_bits(std::size_t size) { + return size * static_cast<std::size_t>(CHAR_BIT); +} + +#if !defined(__GNUC__) + +inline unsigned int clz32(u_int32_t w) { + unsigned int r = 31; + if ((w & 0xffffffff00000000ULL) != 0) { + w = (w >> 31) >> 1; + r -= 32; + } + if ((w & 0xffff0000U) != 0) { + w >>= 16; + r -= 16; + } + if ((w & 0xff00U) != 0) { + w >>= 8; + r -= 8; + } + if ((w & 0xf0U) != 0) { + w >>= 4; + r -= 4; + } + if ((w & 0xcU) != 0) { + w >>= 2; + r -= 2; + } + if ((w & 0x2U) != 0) + r -= 1; + return r; +} + +inline unsigned int clz64(u_int64_t w) { + if ((w & 0xffffffff00000000ULL) == 0) + return clz32(static_cast<u_int32_t>(w)) + 32; + else + return clz32(static_cast<u_int32_t>(w >> 32)); +} + +inline unsigned int ctz32(u_int32_t w) { + static const unsigned int mod37_table[] = { + 32, 0, 1, 26, 2, 23, 27, 0, 3, 16, 24, 30, 28, 11, 0, 13, + 4, 7, 17, 0, 25, 22, 31, 15, 29, 10, 12, 6, 0, 21, 14, 9, + 5, 20, 8, 19, 18 + }; + return mod37_table[(w & -w) % 37]; +} + +inline unsigned int ctz64(u_int64_t w) { + if ((w & 0x00000000ffffffffULL) == 0) + return ctz32(static_cast<u_int32_t>(w >> 32)) + 32; + else + return ctz32(static_cast<u_int32_t>(w)); +} + +#endif + +inline unsigned int +clz(unsigned int u) { + PPL_ASSERT(u != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_clz(u)); +#elif PPL_SIZEOF_INT == 4 + return clz32(u); +#elif PPL_SIZEOF_INT == 8 + return clz64(u); +#else + #error "Unsupported unsigned int size" +#endif +} + +inline unsigned int +clz(unsigned long ul) { + PPL_ASSERT(ul != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_clzl(ul)); +#elif PPL_SIZEOF_LONG == 4 + return clz32(u); +#elif PPL_SIZEOF_LONG == 8 + return clz64(u); +#else + #error "Unsupported unsigned long size" +#endif +} + +inline unsigned int +clz(unsigned long long ull) { + PPL_ASSERT(ull != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_clzll(ull)); +#elif PPL_SIZEOF_LONG_LONG == 4 + return clz32(u); +#elif PPL_SIZEOF_LONG_LONG == 8 + return clz64(u); +#else + #error "Unsupported unsigned long long size" +#endif +} + + +inline unsigned int +ctz(unsigned int u) { + PPL_ASSERT(u != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_ctz(u)); +#elif PPL_SIZEOF_INT == 4 + return ctz32(u); +#elif PPL_SIZEOF_INT == 8 + return ctz64(u); +#else + #error "Unsupported unsigned int size" +#endif +} + +inline unsigned int +ctz(unsigned long ul) { + PPL_ASSERT(ul != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_ctzl(ul)); +#elif PPL_SIZEOF_LONG == 4 + return ctz32(u); +#elif PPL_SIZEOF_LONG == 8 + return ctz64(u); +#else + #error "Unsupported unsigned long size" +#endif +} + +inline unsigned int +ctz(unsigned long long ull) { + PPL_ASSERT(ull != 0); +#if defined(__GNUC__) + return static_cast<unsigned int>(__builtin_ctzll(ull)); +#elif PPL_SIZEOF_LONG_LONG == 4 + return ctz32(u); +#elif PPL_SIZEOF_LONG_LONG == 8 + return ctz64(u); +#else + #error "Unsupported unsigned long long size" +#endif +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_compiler_hh) diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index 97bde3f..513ec2e 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -27,6 +27,7 @@ site: http://bugseng.com/products/ppl/ . */ #include <limits> #include <cassert> #include <cctype> +#include "compiler.hh" namespace Parma_Polyhedra_Library { @@ -48,7 +49,7 @@ Weightwatch_Traits::get() { inline bool Weightwatch_Traits::less_than(const Threshold& a, const Threshold& b) { - return b - a < (1ULL << (sizeof(Threshold)*8 - 1)); + return b - a < (1ULL << (sizeof_to_bits(sizeof(Threshold)) - 1)); } inline void

1 0

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

22 Feb '12

Module: ppl/ppl Branch: master Commit: ff759c6b48d0bf2ed81e2bcdaf5aa072d1b540e5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ff759c6b48d0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 10:09:23 2012 +0100 Prefer using C_Integer traits rather than macros in <climits>, thereby avoiding a few implicit conversions changing signedness. Detected by ECLAIR service utypflag. --- src/Bit_Matrix.cc | 11 +++++++---- src/Bit_Row.cc | 16 ++++++++-------- src/checked.cc | 9 +++++---- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/Bit_Matrix.cc b/src/Bit_Matrix.cc index 75e1fb1..96243f7 100644 --- a/src/Bit_Matrix.cc +++ b/src/Bit_Matrix.cc @@ -25,9 +25,9 @@ site: http://bugseng.com/products/ppl/ . */ #include "Bit_Matrix.defs.hh" #include "globals.defs.hh" #include "swapping_sort.templates.hh" +#include "C_Integer.hh" #include <iostream> #include <string> -#include <climits> namespace PPL = Parma_Polyhedra_Library; @@ -85,7 +85,8 @@ PPL::Bit_Matrix::transpose() { const dimension_type ncols = num_columns(); Bit_Matrix tmp(ncols, nrows); for (dimension_type i = nrows; i-- > 0; ) - for (unsigned long j = x[i].last(); j != ULONG_MAX; j = x[i].prev(j)) + for (unsigned long j = x[i].last(); + j != C_Integer<unsigned long>::max; j = x[i].prev(j)) tmp[j].set(i); m_swap(tmp); PPL_ASSERT(OK()); @@ -97,7 +98,8 @@ PPL::Bit_Matrix::transpose_assign(const Bit_Matrix& y) { const dimension_type y_num_columns = y.num_columns(); Bit_Matrix tmp(y_num_columns, y_num_rows); for (dimension_type i = y_num_rows; i-- > 0; ) - for (unsigned long j = y[i].last(); j != ULONG_MAX; j = y[i].prev(j)) + for (unsigned long j = y[i].last(); + j != C_Integer<unsigned long>::max; j = y[i].prev(j)) tmp[j].set(i); m_swap(tmp); PPL_ASSERT(OK()); @@ -205,7 +207,8 @@ PPL::Bit_Matrix::OK() const { const Bit_Row& row = x[i]; if (!row.OK()) return false; - else if (row.last() != ULONG_MAX && row.last() >= row_size) { + else if (row.last() != C_Integer<unsigned long>::max + && row.last() >= row_size) { #ifndef NDEBUG cerr << "Bit_Matrix[" << i << "] is a row with too many bits!" << endl diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 9fec973..ac56da2 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -24,7 +24,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "Bit_Row.defs.hh" #include "assert.hh" -#include <climits> +#include "C_Integer.hh" namespace PPL = Parma_Polyhedra_Library; @@ -38,7 +38,7 @@ PPL::Bit_Row::first() const { if (limb != 0) return li*PPL_BITS_PER_GMP_LIMB + Implementation::first_one(limb); } - return ULONG_MAX; + return C_Integer<unsigned long>::max; } unsigned long @@ -50,13 +50,13 @@ PPL::Bit_Row::next(unsigned long position) const { // case mpz_scan1() is improved. // // unsigned long r = mpz_scan1(vec, position); - // return (r == ULONG_MAX) ? -1 : r; + // return (r == C_Integer<unsigned long>::max) ? -1 : r; mp_size_t li = position / PPL_BITS_PER_GMP_LIMB; const mp_size_t vec_size = vec->_mp_size; PPL_ASSERT(vec_size >= 0); if (li >= vec_size) - return ULONG_MAX; + return C_Integer<unsigned long>::max; // Get the first limb. mp_srcptr p = vec->_mp_d + li; @@ -74,7 +74,7 @@ PPL::Bit_Row::next(unsigned long position) const { ++p; limb = *p; } - return ULONG_MAX; + return C_Integer<unsigned long>::max; } unsigned long @@ -82,7 +82,7 @@ PPL::Bit_Row::last() const { mp_size_t li = vec->_mp_size; PPL_ASSERT(li >= 0); if (li == 0) - return ULONG_MAX; + return C_Integer<unsigned long>::max; --li; const mp_srcptr p = vec->_mp_d + li; const mp_limb_t limb = *p; @@ -93,7 +93,7 @@ PPL::Bit_Row::last() const { unsigned long PPL::Bit_Row::prev(unsigned long position) const { if (position == 0) - return ULONG_MAX; + return C_Integer<unsigned long>::max; --position; @@ -127,7 +127,7 @@ PPL::Bit_Row::prev(unsigned long position) const { --p; limb = *p; } - return ULONG_MAX; + return C_Integer<unsigned long>::max; } bool diff --git a/src/checked.cc b/src/checked.cc index 2fc1900..b024861 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -23,7 +23,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl-config.h" #include "checked.defs.hh" -#include <climits> +#include "C_Integer.hh" namespace Parma_Polyhedra_Library { @@ -109,7 +109,7 @@ inline bool sum_sign(bool& a_neg, unsigned long& a_mod, bool b_neg, unsigned long b_mod) { if (a_neg == b_neg) { - if (a_mod > ULONG_MAX - b_mod) + if (a_mod > C_Integer<unsigned long>::max - b_mod) return false; a_mod += b_mod; } @@ -279,8 +279,9 @@ parse_number_part(std::istream& is, number_struct& numer) { exp: state = EXPONENT; PPL_ASSERT(numer.base >= 2); - max_exp_div = LONG_MAX / numer.base; - max_exp_rem = static_cast<int>(LONG_MAX % numer.base); + const long l_max = C_Integer<long>::max; + max_exp_div = static_cast<unsigned long>(l_max) / numer.base; + max_exp_rem = static_cast<int>(l_max % static_cast<long>(numer.base)); if (!is.get(c)) return V_CVT_STR_UNK; if (c == '-') {

1 0

[GIT] ppl/ppl(master): Declare pure virtual methods in abstract base classes.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 7214979d8337182cd1592292abdaabc772c0f94c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7214979d8337… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 09:21:44 2012 +0100 Declare pure virtual methods in abstract base classes. Override them only once in derived classes. Detected by ECLAIR service ovrdonce. --- src/PIP_Tree.cc | 16 ++++++++-------- src/PIP_Tree.defs.hh | 14 ++++++++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 77bd698..f4b2f28 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1051,23 +1051,23 @@ PIP_Decision_Node::check_ownership(const PIP_Problem* owner) const { && (true_child == 0 || true_child->check_ownership(owner)); } -const PIP_Solution_Node* -PIP_Tree_Node::as_solution() const { - return 0; +const PIP_Decision_Node* +PIP_Decision_Node::as_decision() const { + return this; } const PIP_Decision_Node* -PIP_Tree_Node::as_decision() const { +PIP_Solution_Node::as_decision() const { return 0; } const PIP_Solution_Node* -PIP_Solution_Node::as_solution() const { - return this; +PIP_Decision_Node::as_solution() const { + return 0; } -const PIP_Decision_Node* -PIP_Decision_Node::as_decision() const { +const PIP_Solution_Node* +PIP_Solution_Node::as_solution() const { return this; } diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 043895b..226d439 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -74,13 +74,13 @@ public: virtual ~PIP_Tree_Node(); //! Returns \c true if and only if \p *this is well formed. - virtual bool OK() const; + virtual bool OK() const = 0; //! Returns \p this if \p *this is a solution node, 0 otherwise. - virtual const PIP_Solution_Node* as_solution() const; + virtual const PIP_Solution_Node* as_solution() const = 0; //! Returns \p this if \p *this is a decision node, 0 otherwise. - virtual const PIP_Decision_Node* as_decision() const; + virtual const PIP_Decision_Node* as_decision() const = 0; /*! \brief Returns the system of parameter constraints controlling \p *this. @@ -242,7 +242,7 @@ protected: virtual void print_tree(std::ostream& s, unsigned indent, const std::vector<bool>& pip_dim_is_param, - dimension_type first_art_dim) const; + dimension_type first_art_dim) const = 0; //! A helper function used when printing PIP trees. static void @@ -368,6 +368,9 @@ public: //! Returns \p this. virtual const PIP_Solution_Node* as_solution() const; + //! Returns 0, since \p this is not a decision node. + virtual const PIP_Decision_Node* as_decision() const; + /*! \brief Returns a parametric expression for the values of problem variable \p var. @@ -708,6 +711,9 @@ public: //! Returns \p this. virtual const PIP_Decision_Node* as_decision() const; + //! Returns 0, since \p this is not a solution node. + virtual const PIP_Solution_Node* as_solution() const; + //! Returns a const pointer to the \p b (true or false) branch of \p *this. const PIP_Tree_Node* child_node(bool b) const;

1 0

[GIT] ppl/ppl(master): Specify the `virtual' keyword when declaring overriding methods.
by Enea Zaffanella 22 Feb '12

22 Feb '12

Module: ppl/ppl Branch: master Commit: 1a28c03f8b5cc431553f06385c8124acfc9ab4e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1a28c03f8b5c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Feb 22 08:38:08 2012 +0100 Specify the `virtual' keyword when declaring overriding methods. Detected by ECLAIR service ovrdexpl. --- src/Handler.defs.hh | 10 ++++++---- src/c_streambuf.defs.hh | 14 +++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/Handler.defs.hh b/src/Handler.defs.hh index 6914b09..5a0e400 100644 --- a/src/Handler.defs.hh +++ b/src/Handler.defs.hh @@ -63,9 +63,11 @@ public: //! Constructor with a given function. Handler_Flag(const Flag_Base* volatile& holder, Flag& flag); - //! Does its job: installs the flag onto the holder, if a flag with - //! an higher priority has not already been installed. - void act() const; + /*! \brief + Does its job: installs the flag onto the holder, if a flag with + an higher priority has not already been installed. + */ + virtual void act() const; private: // declare holder as reference to volatile pointer to const Flag_Base @@ -81,7 +83,7 @@ public: Handler_Function(void (*function)()); //! Does its job: calls the embedded function. - void act() const; + virtual void act() const; private: //! Pointer to the embedded function. diff --git a/src/c_streambuf.defs.hh b/src/c_streambuf.defs.hh index 1ed401b..b8e0d98 100644 --- a/src/c_streambuf.defs.hh +++ b/src/c_streambuf.defs.hh @@ -43,7 +43,7 @@ protected: \remarks Specified by ISO/IEC 14882:1998: 27.5.2.4.3. */ - int_type underflow(); + virtual int_type underflow(); /*! \brief In case of underflow, gets a character and advances the next pointer. @@ -51,7 +51,7 @@ protected: \remarks Specified by ISO/IEC 14882:1998: 27.5.2.4.3. */ - int_type uflow(); + virtual int_type uflow(); /*! \brief Gets a sequence of characters. @@ -59,7 +59,7 @@ protected: \remarks Specified by ISO/IEC 14882:1998: 27.5.2.4.3. */ - std::streamsize xsgetn(char_type* s, std::streamsize n); + virtual std::streamsize xsgetn(char_type* s, std::streamsize n); /*! \brief Puts character back in case of backup underflow. @@ -67,7 +67,7 @@ protected: \remarks Specified by ISO/IEC 14882:1998: 27.5.2.4.4. */ - int_type pbackfail(int_type c = traits_type::eof()); + virtual int_type pbackfail(int_type c = traits_type::eof()); /*! \brief Writes a sequence of characters. @@ -75,21 +75,21 @@ protected: \remarks Specified by ISO/IEC 14882:1998: 27.5.2.4.5. */ - std::streamsize xsputn(const char_type* s, std::streamsize n); + virtual std::streamsize xsputn(const char_type* s, std::streamsize n); /*! \brief Writes a character in case of overflow. Specified by ISO/IEC 14882:1998: 27.5.2.4.5. */ - int_type overflow(int_type c); + virtual int_type overflow(int_type c); /*! \brief Synchronizes the stream buffer. Specified by ISO/IEC 14882:1998: 27.5.2.4.2. */ - int sync(); + virtual int sync(); private: //! Character type of the streambuf.

1 0

[GIT] ppl/ppl(master): Move declarations to nsure variables are declared at smallest possible scope .
by Patricia Hill 21 Feb '12

21 Feb '12

Module: ppl/ppl Branch: master Commit: cb89844f83a5aa0591bece53a9ce517e9c807da1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb89844f83a5… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Feb 21 19:58:36 2012 +0000 Move declarations to nsure variables are declared at smallest possible scope. Detected by ECLAIR service minscope. --- src/ppl-config.cc.in | 93 +++++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index b494a1f..005e712 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -100,10 +100,6 @@ Interface required_interface = NO_INTERFACE; std::string prefix; std::string exec_prefix; -const char* variable_prefix = "PPL_"; - -bool exec_prefix_set = false; - bool required_application = false; bool required_library = false; bool required_prefix = false; @@ -162,48 +158,6 @@ struct option long_options[] = { }; #endif -static const char* usage_string -= "Usage: %s [OPTION]...\n" -"Displays information, in various formats, about an installation\n" -"of the Parma Polyhedra Library.\n\n" -"Options:\n" -" -h, --help prints this help text to stdout\n" -" -FFMT, --format=FMT sets the output format to FMT\n" -" (one of `plain', `makefile', `sh' or `csh')\n" -" -IINT, --interface=INT selects a library interface (one of `C++', `C',\n" -" `Ciao-Prolog', `GNU-Prolog', `SICStus-Prolog',\n" -" `SWI-Prolog', `XSB-Prolog', `YAP-Prolog',\n" -" `OCaml' or `Java')\n" -" -A, --application selects output for building an application\n" -" -L, --library selects output for building a library\n" -" -p[PFX], --prefix[=PFX] prints or sets library prefix information\n" -" -e[PFX], --exec-prefix[=PFX]\n" -" prints or sets library exec-prefix information\n" -" -O, --configure-options prints configuration options\n" -" -V, --version prints version information\n" -" -M, --version-major prints version major number\n" -" -N, --version-minor prints version minor number\n" -" -R, --version-revision prints version revision number\n" -" -B, --version-beta prints version beta number\n" -" -E, --banner prints library banner\n" -" -n, --coefficients prints type of library coefficients\n" -" -i, --includedir prints include files directory\n" -" -b, --bindir prints binary executables directory\n" -" -l, --libdir prints library files directory\n" -" -P, --cppflags prints preprocessor flags\n" -" -C, --cflags prints C compiler flags\n" -" -X, --cxxflags prints C++ compiler flags\n" -" -D, --ldflags prints linker flags\n" -" -g, --license prints synthetic licensing information\n" -" -c, --copying prints detailed licensing information\n" -" -u, --bugs prints bug reporting information\n" -" -r, --credits prints credits\n" -#ifndef PPL_HAVE_GETOPT_H -"\n" -"NOTE: this version does not support long options.\n" -#endif -"\n" -"Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; #define OPTION_LETTERS "hF:I:ALp::e::OVMNRBEniblPCXDgcur" @@ -256,6 +210,52 @@ strcaseeq(const char* s1, const char* s2) { void process_options(int argc, char* argv[]) { + + bool exec_prefix_set = false; + + static const char* usage_string + = "Usage: %s [OPTION]...\n" +"Displays information, in various formats, about an installation\n" +"of the Parma Polyhedra Library.\n\n" +"Options:\n" +" -h, --help prints this help text to stdout\n" +" -FFMT, --format=FMT sets the output format to FMT\n" +" (one of `plain', `makefile', `sh' or `csh')\n" +" -IINT, --interface=INT selects a library interface (one of `C++', `C',\n" +" `Ciao-Prolog', `GNU-Prolog', `SICStus-Prolog',\n" +" `SWI-Prolog', `XSB-Prolog', `YAP-Prolog',\n" +" `OCaml' or `Java')\n" +" -A, --application selects output for building an application\n" +" -L, --library selects output for building a library\n" +" -p[PFX], --prefix[=PFX] prints or sets library prefix information\n" +" -e[PFX], --exec-prefix[=PFX]\n" +" prints or sets library exec-prefix information\n" +" -O, --configure-options prints configuration options\n" +" -V, --version prints version information\n" +" -M, --version-major prints version major number\n" +" -N, --version-minor prints version minor number\n" +" -R, --version-revision prints version revision number\n" +" -B, --version-beta prints version beta number\n" +" -E, --banner prints library banner\n" +" -n, --coefficients prints type of library coefficients\n" +" -i, --includedir prints include files directory\n" +" -b, --bindir prints binary executables directory\n" +" -l, --libdir prints library files directory\n" +" -P, --cppflags prints preprocessor flags\n" +" -C, --cflags prints C compiler flags\n" +" -X, --cxxflags prints C++ compiler flags\n" +" -D, --ldflags prints linker flags\n" +" -g, --license prints synthetic licensing information\n" +" -c, --copying prints detailed licensing information\n" +" -u, --bugs prints bug reporting information\n" +" -r, --credits prints credits\n" +#ifndef PPL_HAVE_GETOPT_H +"\n" +"NOTE: this version does not support long options.\n" +#endif +"\n" +"Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; + while (true) { #ifdef PPL_HAVE_GETOPT_H int option_index = 0; @@ -499,6 +499,7 @@ process_options(int argc, char* argv[]) { void portray_name(const char* name) { + const char* variable_prefix = "PPL_"; switch (required_format) { case PLAIN: if (num_required_items > 1)

1 0