Module: ppl/ppl Branch: master Commit: 909564690348b4dd599d234cb2779eab6b6916af URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=909564690348b...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Tue Oct 11 20:22:31 2011 +0200

Minor readability improvements.

---

demos/ppl_pips/ppl_pips.cc | 6 +++--- src/Bit_Row.cc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 3b2c193..17c00fe 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -168,7 +168,7 @@ pip_display_sol(std::ostream& out, out << "}" << endl; if (!constraints_empty) { out << setw(indent*2) << "" << "else" << endl; - out << setw(indent*2+2) << "" << "_|_" << endl; + out << setw(indent*2 + 2) << "" << "_|_" << endl; } } } @@ -286,7 +286,7 @@ public: std::istringstream sin(line); sin >> ctx_type[i]; for (PPL::dimension_type j = 0; j <= num_params; ++j) { - sin >> context[i * num_ctx_rows + j]; + sin >> context[i*num_ctx_rows + j]; } }

@@ -315,7 +315,7 @@ public: std::istringstream sin(line); sin >> constraint_type[i]; for (PPL::dimension_type j = 0; j < constraint_width; ++j) { - sin >> constraints[i * constraint_width + j]; + sin >> constraints[i*constraint_width + j]; } }

diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index cd2093f..61b9112 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -64,7 +64,8 @@ PPL::Bit_Row::next(unsigned long position) const { mp_srcptr p = vec->_mp_d + li;

// 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); + mp_limb_t limb + = *p & ((~(mp_limb_t) 0) << (position % PPL_BITS_PER_GMP_LIMB));

while (true) { if (limb != 0)