- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): Reordered inclusions so that *.types. hh are included before *.defs.hh.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 8ce105ecb82f5320fc972a5da320ca6726e3f1d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ce105ecb82f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 14:20:23 2011 +0100 Reordered inclusions so that *.types.hh are included before *.defs.hh. --- src/Linear_Expression.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Linear_Expression.defs.hh b/src/Linear_Expression.defs.hh index c8431b7..a054f56 100644 --- a/src/Linear_Expression.defs.hh +++ b/src/Linear_Expression.defs.hh @@ -26,9 +26,6 @@ site: http://bugseng.com/products/ppl/ . */ #include "Linear_Expression.types.hh" -#include "Linear_Expression_Interface.defs.hh" -#include "Variable.defs.hh" - #include "Constraint.types.hh" #include "Generator.types.hh" #include "Grid_Generator.types.hh" @@ -52,6 +49,9 @@ site: http://bugseng.com/products/ppl/ . */ #include "Expression_Hide_Inhomo.types.hh" #include "Expression_Hide_Last.types.hh" +#include "Linear_Expression_Interface.defs.hh" +#include "Variable.defs.hh" + namespace Parma_Polyhedra_Library { // Put them in the namespace here to declare them friend later.

1 0

[GIT] ppl/ppl(sparse_matrices): Added missing inclusion.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 126ad84b5e29a0feb5d08344c79d5d7fe062d4d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=126ad84b5e29… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 14:19:40 2011 +0100 Added missing inclusion. --- src/Linear_Expression_Impl.defs.hh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Linear_Expression_Impl.defs.hh b/src/Linear_Expression_Impl.defs.hh index 0d0e6e7..6a3be00 100644 --- a/src/Linear_Expression_Impl.defs.hh +++ b/src/Linear_Expression_Impl.defs.hh @@ -25,6 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Linear_Expression_Impl_defs_hh 1 #include "Linear_Expression_Impl.types.hh" +#include "Congruence.types.hh" #include "Variable.defs.hh" #include "Variables_Set.defs.hh" #include <cstddef>

1 0

[GIT] ppl/ppl(sparse_matrices): Files <Name>.inlines.hh should not include <Name>.defs.hh.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 77b9607ac1ddff5cb6134fd65d42e8ce0d5f6fdd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=77b9607ac1dd… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 13:14:39 2011 +0100 Files <Name>.inlines.hh should not include <Name>.defs.hh. --- src/Congruence.inlines.hh | 1 - src/Constraint.inlines.hh | 4 ---- src/Constraint_System.inlines.hh | 4 ---- src/Dense_Row.inlines.hh | 4 ---- src/Expression_Hide_Inhomo.inlines.hh | 2 -- src/Expression_Hide_Last.inlines.hh | 2 -- src/Generator.inlines.hh | 4 ---- src/Generator_System.inlines.hh | 4 ---- src/Grid_Generator.inlines.hh | 4 ---- src/Linear_Expression.inlines.hh | 2 -- src/Linear_Expression_Impl.inlines.hh | 2 -- src/Linear_Expression_Impl.templates.hh | 2 -- src/Linear_System.inlines.hh | 4 ---- src/Matrix.inlines.hh | 4 ---- src/Scalar_Products.inlines.hh | 1 - src/Swapping_Vector.inlines.hh | 4 ---- 16 files changed, 0 insertions(+), 48 deletions(-) diff --git a/src/Congruence.inlines.hh b/src/Congruence.inlines.hh index 3df8fd5..fd908d7 100644 --- a/src/Congruence.inlines.hh +++ b/src/Congruence.inlines.hh @@ -24,7 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Congruence_inlines_hh #define PPL_Congruence_inlines_hh 1 -#include "Congruence.defs.hh" #include <sstream> namespace Parma_Polyhedra_Library { diff --git a/src/Constraint.inlines.hh b/src/Constraint.inlines.hh index 4b434c3..8a75f20 100644 --- a/src/Constraint.inlines.hh +++ b/src/Constraint.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Constraint_inlines_hh #define PPL_Constraint_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Constraint.defs.hh" - #include "Linear_Expression.defs.hh" namespace Parma_Polyhedra_Library { diff --git a/src/Constraint_System.inlines.hh b/src/Constraint_System.inlines.hh index 46680bb..c1696ca 100644 --- a/src/Constraint_System.inlines.hh +++ b/src/Constraint_System.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Constraint_System_inlines_hh #define PPL_Constraint_System_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Constraint_System.defs.hh" - #include "Constraint.defs.hh" namespace Parma_Polyhedra_Library { diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 95e093f..625a43b 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Dense_Row_inlines_hh #define PPL_Dense_Row_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Dense_Row.defs.hh" - #include "assert.hh" #include <cstddef> #include <limits> diff --git a/src/Expression_Hide_Inhomo.inlines.hh b/src/Expression_Hide_Inhomo.inlines.hh index 54e850f..195ccf6 100644 --- a/src/Expression_Hide_Inhomo.inlines.hh +++ b/src/Expression_Hide_Inhomo.inlines.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Expression_Hide_Inhomo_inlines_hh #define PPL_Expression_Hide_Inhomo_inlines_hh 1 -#include "Expression_Hide_Inhomo.defs.hh" - #include "Variables_Set.defs.hh" #include "Linear_Expression.defs.hh" diff --git a/src/Expression_Hide_Last.inlines.hh b/src/Expression_Hide_Last.inlines.hh index 2d5adc0..8f07133 100644 --- a/src/Expression_Hide_Last.inlines.hh +++ b/src/Expression_Hide_Last.inlines.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Expression_Hide_Last_inlines_hh #define PPL_Expression_Hide_Last_inlines_hh 1 -#include "Expression_Hide_Last.defs.hh" - #include "Variables_Set.defs.hh" namespace Parma_Polyhedra_Library { diff --git a/src/Generator.inlines.hh b/src/Generator.inlines.hh index 274c48f..c718470 100644 --- a/src/Generator.inlines.hh +++ b/src/Generator.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Generator_inlines_hh #define PPL_Generator_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Generator.defs.hh" - namespace Parma_Polyhedra_Library { inline bool diff --git a/src/Generator_System.inlines.hh b/src/Generator_System.inlines.hh index 08c75d7..facb7da 100644 --- a/src/Generator_System.inlines.hh +++ b/src/Generator_System.inlines.hh @@ -26,10 +26,6 @@ site: http://bugseng.com/products/ppl/ . */ #include "Generator.defs.hh" -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Generator_System.defs.hh" - namespace Parma_Polyhedra_Library { inline diff --git a/src/Grid_Generator.inlines.hh b/src/Grid_Generator.inlines.hh index 1d9337f..60bbbd8 100644 --- a/src/Grid_Generator.inlines.hh +++ b/src/Grid_Generator.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Grid_Generator_inlines_hh #define PPL_Grid_Generator_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Grid_Generator.defs.hh" - namespace Parma_Polyhedra_Library { inline bool diff --git a/src/Linear_Expression.inlines.hh b/src/Linear_Expression.inlines.hh index 0453711..1550ed4 100644 --- a/src/Linear_Expression.inlines.hh +++ b/src/Linear_Expression.inlines.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Linear_Expression_inlines_hh #define PPL_Linear_Expression_inlines_hh 1 -#include "Linear_Expression.defs.hh" - #include "Expression_Hide_Inhomo.defs.hh" #include "Expression_Hide_Last.defs.hh" diff --git a/src/Linear_Expression_Impl.inlines.hh b/src/Linear_Expression_Impl.inlines.hh index 3d86670..5f9f6bd 100644 --- a/src/Linear_Expression_Impl.inlines.hh +++ b/src/Linear_Expression_Impl.inlines.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Linear_Expression_Impl_inlines_hh #define PPL_Linear_Expression_Impl_inlines_hh 1 -#include "Linear_Expression_Impl.defs.hh" - #include "Variable.defs.hh" #include "Coefficient.defs.hh" #include "math_utilities.defs.hh" diff --git a/src/Linear_Expression_Impl.templates.hh b/src/Linear_Expression_Impl.templates.hh index 5564365..13d9698 100644 --- a/src/Linear_Expression_Impl.templates.hh +++ b/src/Linear_Expression_Impl.templates.hh @@ -24,8 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Linear_Expression_Impl_templates_hh #define PPL_Linear_Expression_Impl_templates_hh 1 -#include "Linear_Expression_Impl.defs.hh" - #include "Dense_Row.defs.hh" #include "Sparse_Row.defs.hh" diff --git a/src/Linear_System.inlines.hh b/src/Linear_System.inlines.hh index c70d608..ded0812 100644 --- a/src/Linear_System.inlines.hh +++ b/src/Linear_System.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Linear_System_inlines_hh #define PPL_Linear_System_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Linear_System.defs.hh" - #include "Bit_Row.defs.hh" #include "Coefficient.defs.hh" diff --git a/src/Matrix.inlines.hh b/src/Matrix.inlines.hh index 3fa3ff0..59905b2 100644 --- a/src/Matrix.inlines.hh +++ b/src/Matrix.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Matrix_inlines_hh #define PPL_Matrix_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Matrix.defs.hh" - namespace Parma_Polyhedra_Library { template <typename Row> diff --git a/src/Scalar_Products.inlines.hh b/src/Scalar_Products.inlines.hh index 3fa4294..20f8869 100644 --- a/src/Scalar_Products.inlines.hh +++ b/src/Scalar_Products.inlines.hh @@ -24,7 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Scalar_Products_inlines_hh #define PPL_Scalar_Products_inlines_hh 1 -#include "Scalar_Products.defs.hh" #include "Linear_Expression.defs.hh" #include "Constraint.defs.hh" #include "Generator.defs.hh" diff --git a/src/Swapping_Vector.inlines.hh b/src/Swapping_Vector.inlines.hh index 805d5b9..6949493 100644 --- a/src/Swapping_Vector.inlines.hh +++ b/src/Swapping_Vector.inlines.hh @@ -24,10 +24,6 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Swapping_Vector_inlines_hh #define PPL_Swapping_Vector_inlines_hh 1 -// TODO: Remove this. -// It was added to please KDevelop4. -#include "Swapping_Vector.defs.hh" - namespace Parma_Polyhedra_Library { template <typename T>

1 0

[GIT] ppl/ppl(sparse_matrices): Be more systematic when including Scalar_Products header files.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: cbe0c7241624f49cac7e25b670a78924b9a402cf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cbe0c7241624… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 10:39:25 2011 +0100 Be more systematic when including Scalar_Products header files. --- src/Congruence_System.cc | 1 + src/Grid_Generator_System.cc | 1 + src/Linear_System.templates.hh | 1 + src/Polyhedron_conversion.templates.hh | 1 + src/Polyhedron_widenings.cc | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/Congruence_System.cc b/src/Congruence_System.cc index 9647d0b..acc8c2c 100644 --- a/src/Congruence_System.cc +++ b/src/Congruence_System.cc @@ -29,6 +29,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Congruence.defs.hh" #include "Grid_Generator.defs.hh" #include "Scalar_Products.defs.hh" +#include "Scalar_Products.inlines.hh" #include "assert.hh" #include <string> #include <vector> diff --git a/src/Grid_Generator_System.cc b/src/Grid_Generator_System.cc index 6da6ff2..73f58dd 100644 --- a/src/Grid_Generator_System.cc +++ b/src/Grid_Generator_System.cc @@ -25,6 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Grid_Generator_System.defs.hh" #include "Grid_Generator_System.inlines.hh" #include "Scalar_Products.defs.hh" +#include "Scalar_Products.inlines.hh" #include "Variables_Set.defs.hh" #include "assert.hh" #include <iostream> diff --git a/src/Linear_System.templates.hh b/src/Linear_System.templates.hh index cf92afe..23ac1a9 100644 --- a/src/Linear_System.templates.hh +++ b/src/Linear_System.templates.hh @@ -31,6 +31,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Bit_Matrix.defs.hh" #include "Linear_Expression.defs.hh" #include "Scalar_Products.defs.hh" +#include "Scalar_Products.inlines.hh" #include <algorithm> #include <iostream> #include <string> diff --git a/src/Polyhedron_conversion.templates.hh b/src/Polyhedron_conversion.templates.hh index bb13994..45cd39b 100644 --- a/src/Polyhedron_conversion.templates.hh +++ b/src/Polyhedron_conversion.templates.hh @@ -28,6 +28,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "Bit_Matrix.defs.hh" #include "Polyhedron.defs.hh" #include "Scalar_Products.defs.hh" +#include "Scalar_Products.inlines.hh" #include "Temp.defs.hh" #include "math_utilities.defs.hh" diff --git a/src/Polyhedron_widenings.cc b/src/Polyhedron_widenings.cc index 71aa5bd..5ddb22c 100644 --- a/src/Polyhedron_widenings.cc +++ b/src/Polyhedron_widenings.cc @@ -27,6 +27,7 @@ site: http://bugseng.com/products/ppl/ . */ #include "BHRZ03_Certificate.defs.hh" #include "Rational_Box.hh" #include "Scalar_Products.defs.hh" +#include "Scalar_Products.inlines.hh" #include "assert.hh" #include <iostream> #include <stdexcept>

1 0

[GIT] ppl/ppl(sparse_matrices): Use computed reference ( and avoid unused variable warning).
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 119aeb2aa8f1ec272b892ea9b181793a3f138881 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=119aeb2aa8f1… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 10:01:06 2011 +0100 Use computed reference (and avoid unused variable warning). --- src/Linear_System.templates.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Linear_System.templates.hh b/src/Linear_System.templates.hh index 32c45c7..cf92afe 100644 --- a/src/Linear_System.templates.hh +++ b/src/Linear_System.templates.hh @@ -292,11 +292,11 @@ Linear_System<Row>::insert_pending(Linear_System& y, Recycle_Input) { // This loop must use an increasing index (instead of a decreasing one) to // preserve the row ordering. for (dimension_type i = 0; i < y.num_rows(); i++) - insert_pending(y.rows[i], Recycle_Input()); + x.insert_pending(y.rows[i], Recycle_Input()); y.clear(); - PPL_ASSERT(OK()); + PPL_ASSERT(x.OK()); } template <typename Row>

1 0

[GIT] ppl/ppl(sparse_matrices): Use helper function used() to avoid unused variable warnings.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 6ee60dd34bf229f7dcff5eaa95e5bd407faf5f14 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6ee60dd34bf2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 10:00:19 2011 +0100 Use helper function used() to avoid unused variable warnings. --- src/Grid_Generator.inlines.hh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/Grid_Generator.inlines.hh b/src/Grid_Generator.inlines.hh index 14f3eb0..1d9337f 100644 --- a/src/Grid_Generator.inlines.hh +++ b/src/Grid_Generator.inlines.hh @@ -67,6 +67,7 @@ Grid_Generator::set_is_ray_or_point_or_inequality() { inline void Grid_Generator::set_topology(Topology x) { + used(x); PPL_ASSERT(x == NECESSARILY_CLOSED); } @@ -124,6 +125,7 @@ Grid_Generator::Grid_Generator(dimension_type space_dim, Kind kind, semi_wrapped_expr(expr), wrapped_expr(semi_wrapped_expr, true), kind_(kind) { + used(topology); PPL_ASSERT(topology == NECESSARILY_CLOSED); expr.set_space_dimension(space_dim + 1); PPL_ASSERT(space_dimension() == space_dim);

1 0

[GIT] ppl/ppl(sparse_matrices): Do not use typename keyword for non-dependent type names.
by Enea Zaffanella 11 Dec '11

11 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 611c99c62b6eb36d0553335ff082919942a25266 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=611c99c62b6e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Dec 11 09:58:18 2011 +0100 Do not use typename keyword for non-dependent type names. --- src/Linear_Expression_Impl.templates.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Linear_Expression_Impl.templates.hh b/src/Linear_Expression_Impl.templates.hh index 860f8e1..5564365 100644 --- a/src/Linear_Expression_Impl.templates.hh +++ b/src/Linear_Expression_Impl.templates.hh @@ -358,7 +358,7 @@ Linear_Expression_Impl<Sparse_Row> ::first_nonzero(dimension_type first, dimension_type last) const { PPL_ASSERT(first <= last); PPL_ASSERT(last <= row.size()); - typename Sparse_Row::const_iterator i = row.lower_bound(first); + Sparse_Row::const_iterator i = row.lower_bound(first); if (i != row.end() && i.index() < last) return i.index(); @@ -385,8 +385,8 @@ Linear_Expression_Impl<Sparse_Row> ::last_nonzero(dimension_type first, dimension_type last) const { PPL_ASSERT(first <= last); PPL_ASSERT(last <= row.size()); - typename Sparse_Row::const_iterator itr1 = row.lower_bound(first); - typename Sparse_Row::const_iterator itr2 = row.lower_bound(last); + Sparse_Row::const_iterator itr1 = row.lower_bound(first); + Sparse_Row::const_iterator itr2 = row.lower_bound(last); if (itr1 == itr2) return last;

1 0

[GIT] ppl/ppl(master): Added functions ppl_unreachable() and ppl_unreachable_msg(),
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: 5d56513b2dc23fae0bc40c822299f2cfc18dad35 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5d56513b2dc2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 12:50:48 2011 +0100 Added functions ppl_unreachable() and ppl_unreachable_msg(), causing program termination using abort(). Let PPL_UNREACHABLE and PPL_ASSERT be based on these functions. Avoid a cycle in header inclusion dependencies. --- doc/devref.doxyconf-html.in | 2 + doc/devref.doxyconf-latex.in | 2 + src/Makefile.am | 1 + src/Partial_Function.inlines.hh | 2 +- src/assert.cc | 44 +++++++++++++++++++ src/assert.hh | 91 +++++++++++++++++++++++++++------------ src/checked.defs.hh | 1 + src/globals.inlines.hh | 2 +- 8 files changed, 115 insertions(+), 30 deletions(-) diff --git a/doc/devref.doxyconf-html.in b/doc/devref.doxyconf-html.in index ea929aa..33619fd 100644 --- a/doc/devref.doxyconf-html.in +++ b/doc/devref.doxyconf-html.in @@ -92,6 +92,8 @@ INPUT = @srcdir@/definitions.dox \ ../src/version.hh \ @srcdir@/../src/version.cc \ @srcdir@/../src/meta_programming.hh \ + @srcdir@/../src/assert.hh \ + @srcdir@/../src/assert.cc \ @srcdir@/../src/Float.defs.hh \ @srcdir@/../src/Float.inlines.hh \ @srcdir@/../src/Float.cc \ diff --git a/doc/devref.doxyconf-latex.in b/doc/devref.doxyconf-latex.in index 1c75de1..7521241 100644 --- a/doc/devref.doxyconf-latex.in +++ b/doc/devref.doxyconf-latex.in @@ -92,6 +92,8 @@ INPUT = @srcdir@/definitions.dox \ ../src/version.hh \ @srcdir@/../src/version.cc \ @srcdir@/../src/meta_programming.hh \ + @srcdir@/../src/assert.hh \ + @srcdir@/../src/assert.cc \ @srcdir@/../src/Float.defs.hh \ @srcdir@/../src/Float.inlines.hh \ @srcdir@/../src/Float.cc \ diff --git a/src/Makefile.am b/src/Makefile.am index be1d931..1e488e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -431,6 +431,7 @@ BDS_Status.idefs.hh \ Og_Status.idefs.hh libppl_la_SOURCES = \ +assert.cc \ Box.cc \ checked.cc \ Checked_Number.cc \ diff --git a/src/Partial_Function.inlines.hh b/src/Partial_Function.inlines.hh index 1ca05fb..212088b 100644 --- a/src/Partial_Function.inlines.hh +++ b/src/Partial_Function.inlines.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_Partial_Function_inlines_hh 1 #include <stdexcept> -#include <cassert> +#include "assert.hh" namespace Parma_Polyhedra_Library { diff --git a/src/assert.cc b/src/assert.cc new file mode 100644 index 0000000..2a951a4 --- /dev/null +++ b/src/assert.cc @@ -0,0 +1,44 @@ +/* Definitions of assert-like functions. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2011 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +#include "ppl-config.h" +#include "assert.hh" +#include <cstdlib> +#include <iostream> + +namespace PPL = Parma_Polyhedra_Library; + +void +PPL::ppl_unreachable() { + abort(); +} + +void +PPL::ppl_unreachable_msg(const char* msg, + const char* file, unsigned int line, + const char* function) { + std::cerr << "Aborting PPL computation!\n"; + std::cerr << file << ":" << line << ": " << function << ": " << msg << "\n"; + abort(); +} + diff --git a/src/assert.hh b/src/assert.hh index f480f10..277fd07 100644 --- a/src/assert.hh +++ b/src/assert.hh @@ -1,4 +1,4 @@ -/* Implementation of PPL_ASSERT macro. +/* Implementation of PPL assert-like macros. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> Copyright (C) 2010-2011 BUGSENG srl (http://bugseng.com) @@ -24,55 +24,90 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_assert_hh #define PPL_assert_hh 1 -#include <cassert> #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) +#define PPL_UNREACHABLE_MSG(msg__) Parma_Polyhedra_Library::ppl_unreachable() +#else +#define PPL_UNREACHABLE_MSG(msg__) Parma_Polyhedra_Library:: \ + ppl_unreachable_msg(msg__, __FILE__, __LINE__, __func__) +#endif + +// The PPL_UNREACHABLE macro flags a program point as unreachable. +#define PPL_UNREACHABLE PPL_UNREACHABLE_MSG("unreachable") -#define PPL_ASSERT(cond__) -#define PPL_ASSERT_HEAVY(cond__) -// Try to force a segmentation fault (volatile null pointer deref). -#define PPL_UNREACHABLE (*(volatile int*)0) +// Helper macro PPL_ASSERT_IMPL_: do not use it directly. +#if defined(NDEBUG) +#define PPL_ASSERT_IMPL_(cond__) ((void) 0) #else +#define PPL_STRING_(s) #s +#define PPL_ASSERT_IMPL_(cond__) \ + ((cond__) ? (void) 0 : PPL_UNREACHABLE_MSG(PPL_STRING_(cond__))) +#endif + // Non zero to detect use of PPL_ASSERT instead of PPL_ASSERT_HEAVY #define PPL_DEBUG_PPL_ASSERT 1 -#if !PPL_DEBUG_PPL_ASSERT -#define PPL_ASSERT(cond__) assert(cond__) + +// The PPL_ASSERT macro states that Boolean condition cond__ should hold. +// This is meant to replace uses of C assert(). +#if defined(NDEBUG) || (!PPL_DEBUG_PPL_ASSERT) +#define PPL_ASSERT(cond__) PPL_ASSERT_IMPL_(cond__) #else -#define PPL_ASSERT(cond__) \ - do { \ - Parma_Polyhedra_Library::Weightwatch_Traits::Threshold \ - old_weight__ \ - = Parma_Polyhedra_Library::Weightwatch_Traits::weight; \ - assert(cond__); \ - assert(old_weight__ == Parma_Polyhedra_Library::Weightwatch_Traits::weight && \ - "PPL_ASSERT_HEAVY have to be used here"); \ +#define PPL_ASSERT(cond__) \ + do { \ + typedef Parma_Polyhedra_Library::Weightwatch_Traits W_Traits; \ + W_Traits::Threshold old_weight__ = W_Traits::weight; \ + PPL_ASSERT_IMPL_(cond__); \ + PPL_ASSERT_IMPL_(old_weight__ == W_Traits::weight \ + && "PPL_ASSERT_HEAVY have to be used here"); \ } while(0) -#endif +#endif // !defined(NDEBUG) && PPL_DEBUG_PPL_ASSERT -// The evaluation of asserted conditions could have a non zero -// computational weight (i.e., the execution path could contain an -// invocation of WEIGHT_ADD). -#define PPL_ASSERT_HEAVY(cond__) \ - do { \ - ++Parma_Polyhedra_Library::Implementation::in_assert; \ - assert(cond__); \ - --Parma_Polyhedra_Library::Implementation::in_assert; \ - } while (0) - -#define PPL_UNREACHABLE PPL_ASSERT(false) +// Macro PPL_ASSERT_HEAVY is meant to be used when the evaluation of +// the assertion may change computational weights (via WEIGHT_ADD). +#if defined(NDEBUG) +#define PPL_ASSERT_HEAVY(cond__) PPL_ASSERT_IMPL_(cond__) +#else +#define PPL_ASSERT_HEAVY(cond__) \ + do { \ + ++Parma_Polyhedra_Library::Implementation::in_assert; \ + PPL_ASSERT_IMPL_(cond__); \ + --Parma_Polyhedra_Library::Implementation::in_assert; \ + } while (0) #endif // !defined(NDEBUG) +// Macro PPL_EXPECT (resp., PPL_EXPECT_HEAVY) should be used rather than +// PPL_ASSERT (resp., PPL_ASSERT_HEAVY) when the condition is assumed to +// hold but it is not under library control (typically, it depends on +// user provided input). +#define PPL_EXPECT(cond__) PPL_ASSERT(cond__) #define PPL_EXPECT_HEAVY(cond__) PPL_ASSERT_HEAVY(cond__) namespace Parma_Polyhedra_Library { #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +//! Helper function causing program termination by calling \c abort. +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +void ppl_unreachable() __attribute__((weak, noreturn)); + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +/*! \brief + Helper function printing message on \c std::cerr and causing program + termination by calling \c abort. +*/ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +void ppl_unreachable_msg(const char* msg, + const char* file, unsigned int line, + const char* function) __attribute__((weak, noreturn)); + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief Returns \c true if and only if \p x_copy contains \p y_copy. diff --git a/src/checked.defs.hh b/src/checked.defs.hh index 642d763..7434544 100644 --- a/src/checked.defs.hh +++ b/src/checked.defs.hh @@ -24,6 +24,7 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_checked_defs_hh #define PPL_checked_defs_hh 1 +#include <cassert> #include <iostream> #include <gmpxx.h> #include "mp_std_bits.defs.hh" diff --git a/src/globals.inlines.hh b/src/globals.inlines.hh index 6a72759..7098542 100644 --- a/src/globals.inlines.hh +++ b/src/globals.inlines.hh @@ -25,7 +25,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_globals_inlines_hh 1 #include <limits> -#include "assert.hh" +#include <cassert> namespace Parma_Polyhedra_Library {

1 0

[GIT] ppl/ppl(master): Corrected typo causing test failures.
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: 31dbca0af5eaf369f58e5b1f250c90ba744193de URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=31dbca0af5ea… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 08:10:30 2011 +0100 Corrected typo causing test failures. --- src/CO_Tree.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/CO_Tree.cc b/src/CO_Tree.cc index 86fda2f..48b6760 100644 --- a/src/CO_Tree.cc +++ b/src/CO_Tree.cc @@ -1045,11 +1045,11 @@ PPL::CO_Tree::move_data_from(CO_Tree& tree) { #ifndef NDEBUG case 3: break; -#endif default: PPL_UNREACHABLE; break; +#endif } // We now visit the current tree

1 0

[GIT] ppl/ppl(master): Prefer early return to dummy assignment in unreachable code path.
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: 50504a0234039cab2e473884ed378a3058739412 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=50504a023403… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 07:42:51 2011 +0100 Prefer early return to dummy assignment in unreachable code path. --- src/Polyhedron_public.cc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index a3f242b..8f61679 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -3017,8 +3017,7 @@ generalized_affine_preimage(const Variable var, default: // The EQUAL and NOT_EQUAL cases have been already dealt with. PPL_UNREACHABLE; - reversed_relsym = GREATER_OR_EQUAL; - break; + return; } // Check whether the preimage of this affine relation can be easily

1 0