Module: ppl/ppl Branch: master Commit: 2d63fb4b83f94a61090bbcbecb4b52d2f47e589b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d63fb4b83f94...
Author: Roberto Bagnara bagnara@cs.unipr.it Date: Wed Sep 28 14:35:16 2011 +0200
Fixed several indentation mistakes.
---
demos/ppl_lpsol/ppl_lpsol.c | 2 +- .../ppl_interface_generator_prolog_cc_code.m4 | 35 +++++++++---------- src/BD_Shape.templates.hh | 4 +- src/Box.templates.hh | 2 +- src/Constraint_System.cc | 4 +- src/Octagonal_Shape.templates.hh | 10 +++--- 6 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 5c1e16a..b0dad47 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -762,7 +762,7 @@ add_constraints(ppl_Linear_Expression_t ppl_le, ppl_delete_Constraint(ppl_c); break;
- default: + default: fatal("internal error"); break; } diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 2ef13a6..9253d35 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -31,31 +31,30 @@ m4_define(`ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension_code', `extern "C" Prolog_foreign_return_type ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension(Prolog_term_ref t_nd, Prolog_term_ref t_uoe, - Prolog_term_ref t_ph) -{ - static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; - try { - @TOPOLOGY@@CPP_CLASS@* ph; - Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); - - if (uoe == a_empty) - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - EMPTY); + Prolog_term_ref t_ph) { + static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; + try { + @TOPOLOGY@@CPP_CLASS@* ph; + Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); + + if (uoe == a_empty) + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + EMPTY); else - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - UNIVERSE); + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + UNIVERSE);
Prolog_term_ref tmp = Prolog_new_term_ref(); Prolog_put_address(tmp, ph); if (Prolog_unify(t_ph, tmp)) { - PPL_REGISTER(ph); - return PROLOG_SUCCESS; - } - else - delete ph; + PPL_REGISTER(ph); + return PROLOG_SUCCESS; } + else + delete ph; + } CATCH_ALL; }
diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 7ff321f..53c55a4 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -3005,7 +3005,7 @@ BD_Shape<T>::get_limiting_shape(const Constraint_System& cs, ls_x = d; ls_y = d1; changed = true; - } + } } } } @@ -4311,7 +4311,7 @@ void BD_Shape<T> // Shortest-path closure is preserved, but not reduction. if (marked_shortest_path_reduced()) reset_shortest_path_reduced(); - if (is_w_coeff_one) { + if (is_w_coeff_one) { // Add the new constraints `var - w >= b_lb' // `and var - w <= b_ub'. add_dbm_constraint(w_id, var_id, b_ub); diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 42ca87e..02159ab 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -783,7 +783,7 @@ Box<ITV>::relation_with(const Congruence& cg) const { && Poly_Con_Relation::is_included() && Poly_Con_Relation::is_disjoint();
- if (space_dim == 0) { + if (space_dim == 0) { if (cg.is_inconsistent()) return Poly_Con_Relation::is_disjoint(); else diff --git a/src/Constraint_System.cc b/src/Constraint_System.cc index 058b8f6..1f53bc3 100644 --- a/src/Constraint_System.cc +++ b/src/Constraint_System.cc @@ -116,8 +116,8 @@ adjust_topology_and_space_dimension(const Topology new_topology, // we just decrement the number of columns to be added. Constraint_System& cs = *this; const dimension_type eps_index = old_space_dim + 1; - const dimension_type old_cs_num_rows = cs.num_rows(); - dimension_type cs_num_rows = old_cs_num_rows; + const dimension_type old_cs_num_rows = cs.num_rows(); + dimension_type cs_num_rows = old_cs_num_rows; bool was_sorted = cs.is_sorted(); if (was_sorted) cs.set_sorted(false); diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 7d446ef..72ad5b6 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1168,7 +1168,7 @@ Octagonal_Shape<T>::is_disjoint_from(const Octagonal_Shape& y) const { const Row_Iterator y_begin = y.matrix.row_begin();
PPL_DIRTY_TEMP(N, neg_y_ci_cj); - for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { + for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { using namespace Implementation::Octagonal_Shapes; const dimension_type i = i_iter.index(); const dimension_type ci = coherent_index(i); @@ -3908,12 +3908,12 @@ Octagonal_Shape<T>::CC76_narrowing_assign(const Octagonal_Shape& y) { bool is_oct_changed = false; typename OR_Matrix<N>::const_element_iterator j = y.matrix.element_begin(); for (typename OR_Matrix<N>::element_iterator i = matrix.element_begin(), - matrix_element_end = matrix.element_end(); + matrix_element_end = matrix.element_end(); i != matrix_element_end; ++i, ++j) { - if (!is_plus_infinity(*i) - && !is_plus_infinity(*j) - && *i != *j) { + if (!is_plus_infinity(*i) + && !is_plus_infinity(*j) + && *i != *j) { *i = *j; is_oct_changed = true; }