Module: ppl/ppl Branch: master Commit: 82085ae7fc2115e6218ce723cbc93ec4f07361b9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=82085ae7fc211... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Mon Aug 20 21:33:27 2012 +0200 Do not declare more than one variable per declaration. Detected by ECLAIR service declgrup_srceline. --- src/Box_templates.hh | 8 ++++++-- src/Grid_conversion.cc | 3 ++- src/Interval_defs.hh | 3 ++- src/Interval_inlines.hh | 27 ++++++++++++++++++--------- src/Pointset_Powerset_templates.hh | 9 ++++----- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/Box_templates.hh b/src/Box_templates.hh index ad1e8e0..b1061b9 100644 --- a/src/Box_templates.hh +++ b/src/Box_templates.hh @@ -2801,7 +2801,9 @@ Box<ITV>::affine_image(const Variable var, if (is_empty()) return; - Tmp_Interval_Type expr_value, temp0, temp1; + Tmp_Interval_Type expr_value; + Tmp_Interval_Type temp0; + Tmp_Interval_Type temp1; expr_value.assign(expr.inhomogeneous_term()); for (Linear_Expression::const_iterator i = expr.begin(), i_end = expr.end(); i != i_end; ++i) { @@ -2881,7 +2883,9 @@ Box<ITV>::affine_preimage(const Variable var, const Coefficient& expr_v = expr.coefficient(var); const bool invertible = (expr_v != 0); if (!invertible) { - Tmp_Interval_Type expr_value, temp0, temp1; + Tmp_Interval_Type expr_value; + Tmp_Interval_Type temp0; + Tmp_Interval_Type temp1; expr_value.assign(expr.inhomogeneous_term()); for (Linear_Expression::const_iterator i = expr.begin(), i_end = expr.end(); i != i_end; ++i) { diff --git a/src/Grid_conversion.cc b/src/Grid_conversion.cc index df033c6..7495825 100644 --- a/src/Grid_conversion.cc +++ b/src/Grid_conversion.cc @@ -323,7 +323,8 @@ Grid::conversion(Congruence_System& source, Grid_Generator_System& dest, // Initialize matrix row number counters and compute the LCM of the // diagonal entries of the proper congruences in `source'. - dimension_type source_num_rows = 0, dest_num_rows = 0; + dimension_type source_num_rows = 0; + dimension_type dest_num_rows = 0; PPL_DIRTY_TEMP_COEFFICIENT(diagonal_lcm); diagonal_lcm = 1; dimension_type dims = source.space_dimension() + 1; diff --git a/src/Interval_defs.hh b/src/Interval_defs.hh index 08378a4..c07f74d 100644 --- a/src/Interval_defs.hh +++ b/src/Interval_defs.hh @@ -332,7 +332,8 @@ public: typename Enable_If<Is_Special<From>::value, I_Result>::type assign(const From&) { info().clear(); - Result rl, ru; + Result rl; + Result ru; switch (From::vclass) { case VC_MINUS_INFINITY: rl = Boundary_NS::set_minus_infinity(LOWER, lower(), info()); diff --git a/src/Interval_inlines.hh b/src/Interval_inlines.hh index 19aedd9..e986771 100644 --- a/src/Interval_inlines.hh +++ b/src/Interval_inlines.hh @@ -257,7 +257,8 @@ Interval<To_Boundary, To_Info>::join_assign(const From& x) { return assign(x); if (check_empty_arg(x)) return combine(V_EQ, V_EQ); - Result rl, ru; + Result rl; + Result ru; rl = min_assign(LOWER, lower(), info(), LOWER, f_lower(x), f_info(x)); ru = max_assign(UPPER, upper(), info(), UPPER, f_upper(x), f_info(x)); PPL_ASSERT(OK()); @@ -279,7 +280,8 @@ Interval<To_Boundary, To_Info>::join_assign(const From1& x, const From2& y) { return assign(x); PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); - Result rl, ru; + Result rl; + Result ru; rl = min_assign(LOWER, lower(), to_info, LOWER, f_lower(x), f_info(x), LOWER, f_lower(y), f_info(y)); @@ -355,7 +357,8 @@ Interval<To_Boundary, To_Info>::difference_assign(const From& x) { return combine(V_EQ, V_EQ); bool nl = ge(LOWER, lower(), info(), LOWER, f_lower(x), f_info(x)); bool nu = le(UPPER, upper(), info(), UPPER, f_upper(x), f_info(x)); - Result rl = V_EQ, ru = V_EQ; + Result rl = V_EQ; + Result ru = V_EQ; if (nl) { if (nu) return assign(EMPTY); @@ -389,7 +392,8 @@ Interval<To_Boundary, To_Info>::difference_assign(const From1& x, return assign(x); bool nl = ge(LOWER, f_lower(x), f_info(x), LOWER, f_lower(y), f_info(y)); bool nu = le(UPPER, f_upper(x), f_info(x), UPPER, f_upper(y), f_info(y)); - Result rl = V_EQ, ru = V_EQ; + Result rl = V_EQ; + Result ru = V_EQ; if (nl) { if (nu) return assign(EMPTY); @@ -558,7 +562,8 @@ Interval<To_Boundary, To_Info>::neg_assign(const From& x) { return assign(EMPTY); PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); - Result rl, ru; + Result rl; + Result ru; PPL_DIRTY_TEMP(To_Boundary, to_lower); rl = Boundary_NS::neg_assign(LOWER, to_lower, to_info, UPPER, f_upper(x), f_info(x)); ru = Boundary_NS::neg_assign(UPPER, upper(), to_info, LOWER, f_lower(x), f_info(x)); @@ -628,7 +633,8 @@ Interval<To_Boundary, To_Info>::sub_assign(const From1& x, const From2& y) { PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); - Result rl, ru; + Result rl; + Result ru; PPL_DIRTY_TEMP(To_Boundary, to_lower); rl = Boundary_NS::sub_assign(LOWER, to_lower, to_info, LOWER, f_lower(x), f_info(x), @@ -670,7 +676,8 @@ Interval<To_Boundary, To_Info>::mul_assign(const From1& x, const From2& y) { int yls = sgn_b(LOWER, f_lower(y), f_info(y)); int yus = (yls > 0) ? 1 : sgn_b(UPPER, f_upper(y), f_info(y)); int inf_sign = Parma_Polyhedra_Library::infinity_sign(x); - int ls, us; + int ls; + int us; if (inf_sign != 0) { ls = yls; us = yus; @@ -697,7 +704,8 @@ Interval<To_Boundary, To_Info>::mul_assign(const From1& x, const From2& y) { PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); - Result rl, ru; + Result rl; + Result ru; PPL_DIRTY_TEMP(To_Boundary, to_lower); if (xls >= 0) { @@ -854,7 +862,8 @@ Interval<To_Boundary, To_Info>::div_assign(const From1& x, const From2& y) { PPL_DIRTY_TEMP(To_Info, to_info); to_info.clear(); - Result rl, ru; + Result rl; + Result ru; PPL_DIRTY_TEMP(To_Boundary, to_lower); if (yls >= 0) { if (xls >= 0) { diff --git a/src/Pointset_Powerset_templates.hh b/src/Pointset_Powerset_templates.hh index 34fffcc..00d1a19 100644 --- a/src/Pointset_Powerset_templates.hh +++ b/src/Pointset_Powerset_templates.hh @@ -1329,11 +1329,10 @@ is_cert_multiset_stabilizing(const std::map<Cert, size_type, typedef std::map<Cert, size_type, typename Cert::Compare> Cert_Multiset; Cert_Multiset x_cert_ms; collect_certificates(x_cert_ms); - typename Cert_Multiset::const_iterator - xi = x_cert_ms.begin(), - x_cert_ms_end = x_cert_ms.end(), - yi = y_cert_ms.begin(), - y_cert_ms_end = y_cert_ms.end(); + typename Cert_Multiset::const_iterator xi = x_cert_ms.begin(); + typename Cert_Multiset::const_iterator x_cert_ms_end = x_cert_ms.end(); + typename Cert_Multiset::const_iterator yi = y_cert_ms.begin(); + typename Cert_Multiset::const_iterator y_cert_ms_end = y_cert_ms.end(); while (xi != x_cert_ms_end && yi != y_cert_ms_end) { const Cert& xi_cert = xi->first; const Cert& yi_cert = yi->first;