- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed and uniformed iomanip uses.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 9cdc037cdf468b82a6d14217c6c1caad531b0bbd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9cdc037cdf46… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 20:14:48 2012 +0100 Fixed and uniformed iomanip uses. --- src/Checked_Number.templates.hh | 13 +++++++------ src/Interval.templates.hh | 2 +- src/Interval_Info.inlines.hh | 18 +++++++++--------- src/Row_Flags.cc | 24 ++++++++++-------------- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/Checked_Number.templates.hh b/src/Checked_Number.templates.hh index d756717..5c6c596 100644 --- a/src/Checked_Number.templates.hh +++ b/src/Checked_Number.templates.hh @@ -39,12 +39,11 @@ ascii_dump(std::ostream& s, const T& t) { else { // An inexact data type (probably floating point): // first dump its hexadecimal representation ... - const std::ios_base::fmtflags old_flags = s.flags(); - s << std::hex; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); const unsigned char* p = reinterpret_cast<const unsigned char*>(&t); for (unsigned i = 0; i < sizeof(T); ++i) { - s << std::setw(2) << std::setfill('0'); - s << static_cast<unsigned>(p[i]); + s << std::setw(2) << std::setfill('0') << static_cast<unsigned>(p[i]); } s.flags(old_flags); // ... and then pretty print it for readability. @@ -55,9 +54,11 @@ ascii_dump(std::ostream& s, const T& t) { template <typename T> typename Enable_If<Is_Native_Or_Checked<T>::value, bool>::type ascii_load(std::istream& s, T& t) { - if (std::numeric_limits<T>::is_exact) + if (std::numeric_limits<T>::is_exact) { // An exact data type: input from pretty printed version is accurate. - return s >> t; + s >> t; + return !s.fail(); + } else { // An inexact data type (probably floating point): // first load its hexadecimal representation ... diff --git a/src/Interval.templates.hh b/src/Interval.templates.hh index 6e9dbc7..d785ac1 100644 --- a/src/Interval.templates.hh +++ b/src/Interval.templates.hh @@ -291,7 +291,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { unexpected: is.unget(); fail: - is.setstate(std::ios_base::failbit); + is.setstate(std::ios::failbit); return is; } diff --git a/src/Interval_Info.inlines.hh b/src/Interval_Info.inlines.hh index da03cc8..4453019 100644 --- a/src/Interval_Info.inlines.hh +++ b/src/Interval_Info.inlines.hh @@ -77,20 +77,20 @@ Interval_Info_Bitset<T, Policy>::m_swap(Interval_Info_Bitset<T, Policy>& y) { template <typename T, typename Policy> inline void Interval_Info_Bitset<T, Policy>::ascii_dump(std::ostream& s) const { - std::ios_base::fmtflags old = s.flags(); - s << std::hex << bitset; - s.flags(old); + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s << bitset; + s.flags(old_flags); } template <typename T, typename Policy> inline bool Interval_Info_Bitset<T, Policy>::ascii_load(std::istream& s) { - std::ios_base::fmtflags old = s.flags(); - s >> std::hex >> bitset; - if (!s) - return false; - s.flags(old); - return true; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s >> bitset; + s.flags(old_flags); + return !s.fail(); } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS diff --git a/src/Row_Flags.cc b/src/Row_Flags.cc index 39a3c8c..60063a4 100644 --- a/src/Row_Flags.cc +++ b/src/Row_Flags.cc @@ -31,15 +31,12 @@ namespace PPL = Parma_Polyhedra_Library; void PPL::Row_Flags::ascii_dump(std::ostream& s) const { s << "0x"; - std::istream::fmtflags f = s.setf(std::istream::hex); + std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); const std::streamsize new_sz = static_cast<std::streamsize>(2 * sizeof(Row_Flags::base_type)); - const std::streamsize old_sz = s.width(new_sz); - std::ostream::char_type ch = s.fill('0'); - s << bits; - s.fill(ch); - s.width(old_sz); - s.flags(f); + s << std::setw(new_sz) << setfill('0') << bits; + s.flags(old_flags); } PPL_OUTPUT_DEFINITIONS_ASCII_ONLY(Row_Flags) @@ -47,12 +44,11 @@ PPL_OUTPUT_DEFINITIONS_ASCII_ONLY(Row_Flags) bool PPL::Row_Flags::ascii_load(std::istream& s) { std::string str; - std::streamsize sz = s.width(2); - if (!(s >> str) || str != "0x") + if (!(s >> std::setw(2) >> str) || str != "0x") return false; - s.width(sz); - std::istream::fmtflags f = s.setf(std::istream::hex); - bool r = s >> bits; - s.flags(f); - return r; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s >> bits; + s.flags(old_flags); + return !s.fail(); }

1 0

[GIT] ppl/ppl(master): Avoid mixing plain character data with numeric data.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: a819fa12f81baba2e8b939e7cf1ec43dae8f6573 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a819fa12f81b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 19:20:46 2012 +0100 Avoid mixing plain character data with numeric data. Detected by ECLAIR service utypflag. --- src/wrap_string.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/wrap_string.cc b/src/wrap_string.cc index 06dac11..b9ba6f4 100644 --- a/src/wrap_string.cc +++ b/src/wrap_string.cc @@ -62,7 +62,7 @@ wrap_string(const std::string& src_string, else if (last_space != npos) split_pos = last_space; else { - for ( ; src[idx] != 0; ++idx) { + for ( ; src[idx] != '\0'; ++idx) { if (src[idx] == ',') { ++idx; break;

1 0

[GIT] ppl/ppl(master): Removed references to an obsolete file.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: a4a27887eb1a1c28eb2b985a8a5acbc0cf702c0a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4a27887eb1a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 15:43:55 2012 +0100 Removed references to an obsolete file. --- doc/devref.doxyconf-html.in | 1 - doc/devref.doxyconf-latex.in | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/devref.doxyconf-html.in b/doc/devref.doxyconf-html.in index 5792164..9b90877 100644 --- a/doc/devref.doxyconf-html.in +++ b/doc/devref.doxyconf-html.in @@ -267,7 +267,6 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Poly_Gen_Relation.defs.hh \ @srcdir@/../src/Poly_Gen_Relation.inlines.hh \ @srcdir@/../src/Poly_Gen_Relation.cc \ - @srcdir@/../src/Interval_Restriction.defs.hh \ @srcdir@/../src/Interval_Info.types.hh \ @srcdir@/../src/Interval_Info.defs.hh \ @srcdir@/../src/Interval_Info.inlines.hh \ diff --git a/doc/devref.doxyconf-latex.in b/doc/devref.doxyconf-latex.in index 0c84017..2d9186d 100644 --- a/doc/devref.doxyconf-latex.in +++ b/doc/devref.doxyconf-latex.in @@ -265,7 +265,6 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Poly_Gen_Relation.defs.hh \ @srcdir@/../src/Poly_Gen_Relation.inlines.hh \ @srcdir@/../src/Poly_Gen_Relation.cc \ - @srcdir@/../src/Interval_Restriction.defs.hh \ @srcdir@/../src/Interval_Info.types.hh \ @srcdir@/../src/Interval_Info.defs.hh \ @srcdir@/../src/Interval_Info.inlines.hh \

1 0

[GIT] ppl/ppl(master): Removed redundant and unused stuff.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: e08bd14506912121a1c188ecbb337e82ec6534c8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e08bd1450691… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 15:28:06 2012 +0100 Removed redundant and unused stuff. --- src/CO_Tree.defs.hh | 2 -- src/MIP_Problem.cc | 27 +-------------------------- 2 files changed, 1 insertions(+), 28 deletions(-) diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index 0a84211..cba1e10 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -145,8 +145,6 @@ public: typedef Coefficient data_type; typedef Coefficient_traits::const_reference data_type_const_reference; - class iterator; - //! A const %iterator on the tree elements, ordered by key. /*! Iterator increment and decrement operations are \f$O(1)\f$ time. diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 9eb8022..66c9978 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -644,29 +644,6 @@ PPL::MIP_Problem return true; } -namespace { - -// This is used as a template argument in process_pending_constraints(), -// so it must be a global declaration. -struct process_pending_constraints_helper_struct { - - PPL::dimension_type index; - const PPL::Coefficient* data; - bool toggle_sign; - - process_pending_constraints_helper_struct(PPL::dimension_type index1, - const PPL::Coefficient* data1, - bool toggle_sign1) - : index(index1), data(data1), toggle_sign(toggle_sign1) { - } - - bool operator<(const process_pending_constraints_helper_struct& x) const { - return index < x.index; - } -}; - -} // namespace - bool PPL::MIP_Problem::process_pending_constraints() { // Check the pending constraints to adjust the data structures. @@ -791,8 +768,6 @@ PPL::MIP_Problem::process_pending_constraints() { ? artificial_index : 0; - typedef process_pending_constraints_helper_struct buffer_element_t; - // Proceed with the insertion of the constraints. for (dimension_type k = tableau_num_rows, i = input_cs.size() - first_pending_constraint; i-- > 0; ) { @@ -2390,7 +2365,7 @@ PPL::MIP_Problem::OK() const { for (dimension_type i = base.size(); i-- > 0; ) vars_in_base.push_back(std::make_pair(base[i], i)); - std::sort(vars_in_base.begin(),vars_in_base.end()); + std::sort(vars_in_base.begin(), vars_in_base.end()); for (dimension_type j = tableau_num_rows; j-- > 0; ) { const Row& tableau_j = tableau[j];

1 0

[GIT] ppl/ppl(master): Use the same typenames in function declarations/ definitions.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 58dff7089d77a0d9762953c66734f95d52b2ddca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58dff7089d77… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:49:39 2012 +0100 Use the same typenames in function declarations/definitions. Detected by ECLAIR service funtypes. --- src/Checked_Number.defs.hh | 2 +- src/Ptr_Iterator.defs.hh | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh index a5d91a9..92c60b9 100644 --- a/src/Checked_Number.defs.hh +++ b/src/Checked_Number.defs.hh @@ -568,7 +568,7 @@ PPL_DECLARE_FUNC4(gcdext_assign_r) //! Returns the total size in bytes of the memory occupied by \p x. /*! \relates Checked_Number */ template <typename T, typename Policy> -size_t +memory_size_type total_memory_in_bytes(const Checked_Number<T, Policy>& x); //! Returns the size in bytes of the memory managed by \p x. diff --git a/src/Ptr_Iterator.defs.hh b/src/Ptr_Iterator.defs.hh index c4ed6e7..2f6c852 100644 --- a/src/Ptr_Iterator.defs.hh +++ b/src/Ptr_Iterator.defs.hh @@ -31,27 +31,27 @@ namespace Parma_Polyhedra_Library { namespace Implementation { -template<typename Q, typename R> -bool operator==(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator==(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator!=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator!=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator<(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator<(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator<=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator<=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator>(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator>(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator>=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator>=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -typename Ptr_Iterator<Q>::difference_type operator-(const Ptr_Iterator<Q>& x, - const Ptr_Iterator<R>& y); +template<typename P, typename Q> +typename Ptr_Iterator::difference_type +operator-(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); template<typename P> Ptr_Iterator operator+(typename Ptr_Iterator::difference_type m,

1 0

[GIT] ppl/ppl(master): Avoid mixing boolean and arithmetic values.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 787dc72b55dd658b8e630e3d2eeb3cf7434c1f5d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=787dc72b55dd… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:11:30 2012 +0100 Avoid mixing boolean and arithmetic values. Detected by ECLAIR service utypflag. --- src/Interval_Info.defs.hh | 2 +- src/Pointset_Powerset.templates.hh | 16 ++++++++-------- src/checked_int.inlines.hh | 22 ++++++++++++---------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/Interval_Info.defs.hh b/src/Interval_Info.defs.hh index 95d91d9..04fb3e9 100644 --- a/src/Interval_Info.defs.hh +++ b/src/Interval_Info.defs.hh @@ -75,7 +75,7 @@ set_bit(T& bits, unsigned int bit, bool value) { template <typename T> inline bool get_bit(const T& bits, unsigned int bit) { - return bits & (static_cast<T>(1) << bit); + return (bits & (static_cast<T>(1) << bit)) != 0; } template <typename T> diff --git a/src/Pointset_Powerset.templates.hh b/src/Pointset_Powerset.templates.hh index 76c1b9b..f2cb3c7 100644 --- a/src/Pointset_Powerset.templates.hh +++ b/src/Pointset_Powerset.templates.hh @@ -925,13 +925,13 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); best_sup_n = 0; best_sup_d = 1; - bool best_max = 0; + bool best_max = false; PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); iter_sup_n = 0; iter_sup_d = 1; - bool iter_max = 0; + bool iter_max = false; PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -981,14 +981,14 @@ Pointset_Powerset<PSET>::maximize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_sup_d); best_sup_n = 0; best_sup_d = 1; - bool best_max = 0; + bool best_max = false; Generator best_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_sup_d); iter_sup_n = 0; iter_sup_d = 1; - bool iter_max = 0; + bool iter_max = false; Generator iter_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -1044,13 +1044,13 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); best_inf_n = 0; best_inf_d = 1; - bool best_min = 0; + bool best_min = false; PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); iter_inf_n = 0; iter_inf_d = 1; - bool iter_min = 0; + bool iter_min = false; PPL_DIRTY_TEMP_COEFFICIENT(tmp); @@ -1100,14 +1100,14 @@ Pointset_Powerset<PSET>::minimize(const Linear_Expression& expr, PPL_DIRTY_TEMP_COEFFICIENT(best_inf_d); best_inf_n = 0; best_inf_d = 1; - bool best_min = 0; + bool best_min = false; Generator best_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_n); PPL_DIRTY_TEMP_COEFFICIENT(iter_inf_d); iter_inf_n = 0; iter_inf_d = 1; - bool iter_min = 0; + bool iter_min = false; Generator iter_g = point(); PPL_DIRTY_TEMP_COEFFICIENT(tmp); diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index bd31616..0a8175b 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -76,16 +76,18 @@ struct Extended_Int { : C_Integer<Type>::min); static const Type not_a_number = ((C_Integer<Type>::min >= 0) - ? (C_Integer<Type>::max - Policy::has_infinity * 2) - : (C_Integer<Type>::min + Policy::has_infinity)); - static const Type min = (C_Integer<Type>::min - + ((C_Integer<Type>::min >= 0) - ? 0 - : (Policy::has_infinity + Policy::has_nan))); - static const Type max = (C_Integer<Type>::max - - ((C_Integer<Type>::min >= 0) - ? (2*Policy::has_infinity + Policy::has_nan) - : Policy::has_infinity)); + ? (C_Integer<Type>::max - 2 * (Policy::has_infinity ? 1 : 0)) + : (C_Integer<Type>::min + (Policy::has_infinity ? 1 : 0))); + static const Type min + = (C_Integer<Type>::min + + ((C_Integer<Type>::min >= 0) + ? 0 + : ((Policy::has_infinity ? 1 : 0) + (Policy::has_nan ? 1 : 0)))); + static const Type max + = (C_Integer<Type>::max + - ((C_Integer<Type>::min >= 0) + ? (2 * (Policy::has_infinity ? 1 : 0) + (Policy::has_nan ? 1 : 0)) + : (Policy::has_infinity ? 1 : 0))); }; template <typename Policy, typename To>

1 0

[GIT] ppl/ppl(master): Get rid of redundant declarations of a couple of functions.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: cb5de9a40b4ce3ccde1104e90da8a154ca877607 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb5de9a40b4c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:09:45 2012 +0100 Get rid of redundant declarations of a couple of functions. Detected by ECLAIR service funtypes. --- src/GMP_Integer.defs.hh | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/src/GMP_Integer.defs.hh b/src/GMP_Integer.defs.hh index e438f97..a80ea6f 100644 --- a/src/GMP_Integer.defs.hh +++ b/src/GMP_Integer.defs.hh @@ -43,23 +43,6 @@ mpz_class& raw_value(GMP_Integer& x); //@} // Accessor Functions -//! \name Memory Size Inspection Functions -//@{ - -#ifndef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Returns the total size in bytes of the memory occupied by \p x. -/*! \relates GMP_Integer */ -#endif // !defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -memory_size_type total_memory_in_bytes(const GMP_Integer& x); - -#ifndef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS -//! Returns the size in bytes of the memory managed by \p x. -/*! \relates GMP_Integer */ -#endif // !defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -memory_size_type external_memory_in_bytes(const GMP_Integer& x); - -//@} // Memory Size Inspection Functions - //! \name Arithmetic Operators //@{

1 0

[GIT] ppl/ppl(master): Simplified Interval_Info::ascii_load().
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: e9fc312f33c36f9e2a3eb520f4881b9abff5d75e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9fc312f33c3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 13:51:03 2012 +0100 Simplified Interval_Info::ascii_load(). Resettting format flags does not change the istream status, which was previously tested and is known to be good: hence, return true. --- src/Interval_Info.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Interval_Info.inlines.hh b/src/Interval_Info.inlines.hh index 0aa03f6..da03cc8 100644 --- a/src/Interval_Info.inlines.hh +++ b/src/Interval_Info.inlines.hh @@ -90,7 +90,7 @@ Interval_Info_Bitset<T, Policy>::ascii_load(std::istream& s) { if (!s) return false; s.flags(old); - return s; + return true; } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS

1 0

[GIT] ppl/ppl(master): `#error' messages made consistent.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 93bbf657068ab68e114336684eef87f7a6ce787c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=93bbf657068a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 14:19:28 2012 +0100 `#error' messages made consistent. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- demos/ppl_pips/ppl_pips.cc | 2 +- fedora/ppl.hh | 2 +- fedora/ppl_c.h | 2 +- fedora/pwl.hh | 2 +- src/BDS_Status.idefs.hh | 2 +- src/Box_Status.idefs.hh | 2 +- src/Float.defs.hh | 6 +++--- src/Grid_Status.idefs.hh | 2 +- src/Og_Status.idefs.hh | 2 +- src/Ph_Status.idefs.hh | 2 +- src/fpu.defs.hh | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index e30de0e..71f22a4 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -30,7 +30,7 @@ site: http://bugseng.com/products/ppl/ . */ (defined(USE_PPL) && defined(USE_POLKA)) \ || (defined(USE_PPL) && defined(USE_POLYLIB)) \ || (defined(USE_POLKA) && defined(USE_POLYLIB)) -#error "Exactly one among USE_PPL, USE_POLKA and USE_POLYLIB must be defined." +#error "Exactly one among USE_PPL, USE_POLKA and USE_POLYLIB must be defined" #endif #if defined(USE_PPL) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 291a6dd..a3d27d7 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -26,7 +26,7 @@ site: http://bugseng.com/products/ppl/ . */ #if (!defined(USE_PPL) && !defined(USE_PIPLIB)) #define USE_PPL 1 #elif (defined(USE_PPL) && defined(USE_PIPLIB)) -#error "Exactly one among USE_PPL and USE_PIPLIB must be defined." +#error "Exactly one among USE_PPL and USE_PIPLIB must be defined" #endif #if defined(USE_PPL) diff --git a/fedora/ppl.hh b/fedora/ppl.hh index b5dbb62..9acdaa8 100644 --- a/fedora/ppl.hh +++ b/fedora/ppl.hh @@ -46,5 +46,5 @@ site: http://bugseng.com/products/ppl/ . */ #elif defined(__sparc__) #include "ppl-sparc.hh" #else -#error "This architecture is not supported by the currently installed ppl-devel packages." +#error "This architecture is not supported by the currently installed ppl-devel packages" #endif diff --git a/fedora/ppl_c.h b/fedora/ppl_c.h index 6132279..23b9617 100644 --- a/fedora/ppl_c.h +++ b/fedora/ppl_c.h @@ -46,5 +46,5 @@ site: http://bugseng.com/products/ppl/ . */ #elif defined(__sparc__) #include "ppl_c-sparc.h" #else -#error "This architecture is not supported by the currently installed ppl-devel packages." +#error "This architecture is not supported by the currently installed ppl-devel packages" #endif diff --git a/fedora/pwl.hh b/fedora/pwl.hh index c468ed7..6ec04b9 100644 --- a/fedora/pwl.hh +++ b/fedora/pwl.hh @@ -46,5 +46,5 @@ site: http://www.cs.unipr.it/Software/ . */ #elif defined(__sparc__) #include "pwl-sparc.hh" #else -#error "This architecture is not supported by the currently installed ppl-pwl-devel packages." +#error "This architecture is not supported by the currently installed ppl-pwl-devel packages" #endif diff --git a/src/BDS_Status.idefs.hh b/src/BDS_Status.idefs.hh index ad25156..cfe2580 100644 --- a/src/BDS_Status.idefs.hh +++ b/src/BDS_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_BDS_Status_idefs_hh 1 #ifndef PPL_IN_BD_Shape_CLASS -#error "Do not include BDS_Status.idefs.hh directly; use BD_Shape.defs.hh instead." +#error "Do not include BDS_Status.idefs.hh directly; use BD_Shape.defs.hh instead" #endif //! A conjunctive assertion about a BD_Shape<T> object. diff --git a/src/Box_Status.idefs.hh b/src/Box_Status.idefs.hh index 3455232..c0dc5e6 100644 --- a/src/Box_Status.idefs.hh +++ b/src/Box_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Box_Status_idefs_hh 1 #ifndef PPL_IN_Box_CLASS -#error "Do not include Box_Status.idefs.hh directly; use Box.defs.hh instead." +#error "Do not include Box_Status.idefs.hh directly; use Box.defs.hh instead" #endif //! A conjunctive assertion about a Box<ITV> object. diff --git a/src/Float.defs.hh b/src/Float.defs.hh index c34de63..9d177c4 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -295,7 +295,7 @@ public: #elif PPL_CXX_FLOAT_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_FLOAT_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_FLOAT_BINARY_FORMAT" #endif union { float number; @@ -324,7 +324,7 @@ public: #elif PPL_CXX_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_DOUBLE_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_DOUBLE_BINARY_FORMAT" #endif union { double number; @@ -353,7 +353,7 @@ public: #elif PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED typedef float_intel_double_extended Binary; #else -#error "invalid value for PPL_CXX_LONG_DOUBLE_BINARY_FORMAT" +#error "Invalid value for PPL_CXX_LONG_DOUBLE_BINARY_FORMAT" #endif union { long double number; diff --git a/src/Grid_Status.idefs.hh b/src/Grid_Status.idefs.hh index cf4e1db..2c94896 100644 --- a/src/Grid_Status.idefs.hh +++ b/src/Grid_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Grid_Status_idefs_hh 1 #ifndef PPL_IN_Grid_CLASS -#error "Do not include Grid_Status.idefs.hh directly; use Grid.defs.hh instead." +#error "Do not include Grid_Status.idefs.hh directly; use Grid.defs.hh instead" #endif //! A conjunctive assertion about a grid. diff --git a/src/Og_Status.idefs.hh b/src/Og_Status.idefs.hh index c1db1db..007c3cb 100644 --- a/src/Og_Status.idefs.hh +++ b/src/Og_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Og_Status_idefs_hh 1 #ifndef PPL_IN_Octagonal_Shape_CLASS -#error "Do not include Og_Status.idefs.hh directly; use Octagonal_Shape.defs.hh instead." +#error "Do not include Og_Status.idefs.hh directly; use Octagonal_Shape.defs.hh instead" #endif //! A conjunctive assertion about a Octagonal_Shape<T> object. diff --git a/src/Ph_Status.idefs.hh b/src/Ph_Status.idefs.hh index 5c5a522..dcbe38c 100644 --- a/src/Ph_Status.idefs.hh +++ b/src/Ph_Status.idefs.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Status_idefs_hh 1 #ifndef PPL_IN_Polyhedron_CLASS -#error "Do not include Ph_Status.idefs.hh directly; use Polyhedron.defs.hh instead." +#error "Do not include Ph_Status.idefs.hh directly; use Polyhedron.defs.hh instead" #endif //! A conjunctive assertion about a polyhedron. diff --git a/src/fpu.defs.hh b/src/fpu.defs.hh index b1933a6..d2a4e12 100644 --- a/src/fpu.defs.hh +++ b/src/fpu.defs.hh @@ -87,7 +87,7 @@ fpu_check_inexact(); #elif defined(PPL_HAVE_FENV_H) #include "fpu-c99.inlines.hh" #else -#error "PPL_CAN_CONTROL_FPU evaluates to true, but why?" +#error "PPL_CAN_CONTROL_FPU evaluates to true: why?" #endif #else // !PPL_CAN_CONTROL_FPU

1 0

[GIT] ppl/ppl(master): Variable names fixed.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 5d988a3b5b9c564a81d91cf3a919cb8bb959bbf8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5d988a3b5b9c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 14:15:07 2012 +0100 Variable names fixed. --- src/compiler.hh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler.hh b/src/compiler.hh index 5ceb298..fe802cd 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -154,9 +154,9 @@ clz(unsigned long ul) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_clzl(ul)); #elif PPL_SIZEOF_LONG == 4 - return clz32(u); + return clz32(ul); #elif PPL_SIZEOF_LONG == 8 - return clz64(u); + return clz64(ul); #else #error "Unsupported unsigned long size" #endif @@ -168,9 +168,9 @@ clz(unsigned long long ull) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_clzll(ull)); #elif PPL_SIZEOF_LONG_LONG == 4 - return clz32(u); + return clz32(ull); #elif PPL_SIZEOF_LONG_LONG == 8 - return clz64(u); + return clz64(ull); #else #error "Unsupported unsigned long long size" #endif @@ -197,9 +197,9 @@ ctz(unsigned long ul) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_ctzl(ul)); #elif PPL_SIZEOF_LONG == 4 - return ctz32(u); + return ctz32(ul); #elif PPL_SIZEOF_LONG == 8 - return ctz64(u); + return ctz64(ul); #else #error "Unsupported unsigned long size" #endif @@ -211,9 +211,9 @@ ctz(unsigned long long ull) { #if defined(__GNUC__) return static_cast<unsigned int>(__builtin_ctzll(ull)); #elif PPL_SIZEOF_LONG_LONG == 4 - return ctz32(u); + return ctz32(ull); #elif PPL_SIZEOF_LONG_LONG == 8 - return ctz64(u); + return ctz64(ull); #else #error "Unsupported unsigned long long size" #endif

1 0