- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(devel): Fixed support for PPL_NO_AUTOMATIC_INITIALIZATION.
by Roberto Bagnara 09 Aug '20

09 Aug '20

Module: ppl/ppl Branch: devel Commit: e8c5fcf766c67394a78790c8a9f016c15d38ae2e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8c5fcf766c6… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Aug 9 18:43:08 2020 +0200 Fixed support for PPL_NO_AUTOMATIC_INITIALIZATION. --- src/Init.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Init.cc b/src/Init.cc index bc1788c69..e92315e36 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -155,33 +155,35 @@ Parma_Polyhedra_Library_thread_initializer_p; } // namespace -static void +#ifdef PPL_NO_AUTOMATIC_INITIALIZATION +void initialize_aux() { if (Parma_Polyhedra_Library_initializer_p == nullptr) { Parma_Polyhedra_Library_initializer_p = new Init(); } } -static void +void finalize_aux() { PPL_ASSERT(Parma_Polyhedra_Library_initializer_p != nullptr); delete Parma_Polyhedra_Library_initializer_p; Parma_Polyhedra_Library_initializer_p = nullptr; } -static void +void thread_initialize_aux() { if (Parma_Polyhedra_Library_thread_initializer_p == nullptr) { Parma_Polyhedra_Library_thread_initializer_p = new Thread_Init(); } } -static void +void thread_finalize_aux() { PPL_ASSERT(Parma_Polyhedra_Library_thread_initializer_p != nullptr); delete Parma_Polyhedra_Library_thread_initializer_p; Parma_Polyhedra_Library_thread_initializer_p = nullptr; } +#endif } // namespace Implementation

1 0

[GIT] ppl/ppl(devel): Fixed several declarations.
by Roberto Bagnara 09 Aug '20

09 Aug '20

Module: ppl/ppl Branch: devel Commit: 5b8ae262417bc9ae81eb5bc634ec487eeecf1bda URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b8ae262417b… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Aug 9 17:02:52 2020 +0200 Fixed several declarations. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- demos/ppl_pips/ppl_pips.cc | 22 +++---- interfaces/C/ppl_c_header.h | 18 +++++- interfaces/C/ppl_c_implementation_common.cc | 14 +++-- interfaces/C/ppl_interface_generator_c_h_code.m4 | 4 +- interfaces/Prolog/ppl_prolog_common.cc | 80 ++++++++++++------------ src/BDS_Status.cc | 5 ++ src/Box_Status.cc | 4 ++ src/Init.cc | 8 +-- src/Og_Status.cc | 4 ++ src/checked.cc | 4 +- src/termination.cc | 6 +- tests/Octagonal_Shape/membytes1.cc | 2 +- 13 files changed, 102 insertions(+), 71 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5b8ae262…

1 0

[GIT] ppl/ppl(devel): Clang's -Wdocumentation-unknown-command has too many false positives.
by Roberto Bagnara 09 Aug '20

09 Aug '20

Module: ppl/ppl Branch: devel Commit: d6dd51bf7408952b8169615401456b43c7210716 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d6dd51bf7408… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Aug 9 10:48:31 2020 +0200 Clang's -Wdocumentation-unknown-command has too many false positives. --- configure.ac | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5c17a0c24..052c6f3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1625,8 +1625,9 @@ AC_CXX_SUPPORTS_LIMITING_MEMORY # Checks for library functions. # Nothing for the time being. -# If we are using GCC or the Intel C/C++ compiler we want to compile -# with lots of warnings enabled. +# If we are using GCC or clang the Intel C/C++ compiler we want to compile +# with lots of warnings enabled, but we still want to disable some warnings +# that give rise to false positives. if test x"$GCC" = xyes then if test x"$ICC" = xyes @@ -1634,7 +1635,7 @@ then CFLAGS="$CFLAGS -w2 -wd161,177,193,279,383,444,981,1098,1188,1418,1419,1572" elif test x"$CLANG" = xyes then - CFLAGS="$CFLAGS -Weverything -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation -Wno-missing-noreturn -Wno-covered-switch-default -Wno-unreachable-code -Wno-c++98-compat-pedantic -Wno-switch-enum -Wno-sign-conversion -Wno-c++98-compat -Wno-padded -Wno-disabled-macro-expansion -Wno-c++11-long-long -Wno-zero-length-array" + CFLAGS="$CFLAGS -Weverything -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation -Wno-missing-noreturn -Wno-covered-switch-default -Wno-unreachable-code -Wno-c++98-compat-pedantic -Wno-switch-enum -Wno-sign-conversion -Wno-c++98-compat -Wno-padded -Wno-disabled-macro-expansion -Wno-c++11-long-long -Wno-zero-length-array -Wno-documentation-unknown-command" else CFLAGS="$CFLAGS -W -Wall" fi @@ -1646,7 +1647,7 @@ then CXXFLAGS="$CXXFLAGS -w2 -wd161,177,193,279,383,444,981,1098,1188,1418,1419,1572" elif test x"$CLANGXX" = xyes then - CXXFLAGS="$CXXFLAGS -Weverything -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation -Wno-missing-noreturn -Wno-covered-switch-default -Wno-unreachable-code -Wno-c++98-compat-pedantic -Wno-switch-enum -Wno-sign-conversion -Wno-c++98-compat -Wno-padded -Wno-disabled-macro-expansion -Wno-c++11-long-long -Wno-zero-length-array" + CXXFLAGS="$CXXFLAGS -Weverything -Wno-exit-time-destructors -Wno-global-constructors -Wno-documentation -Wno-missing-noreturn -Wno-covered-switch-default -Wno-unreachable-code -Wno-c++98-compat-pedantic -Wno-switch-enum -Wno-sign-conversion -Wno-c++98-compat -Wno-padded -Wno-disabled-macro-expansion -Wno-c++11-long-long -Wno-zero-length-array -Wno-documentation-unknown-command" else CXXFLAGS="$CXXFLAGS -W -Wall" fi

1 0

[GIT] ppl/ppl(devel): Make test immune from LTO.
by Roberto Bagnara 09 Aug '20

09 Aug '20

Module: ppl/ppl Branch: devel Commit: d7cd42677f9c59590127badb4c0972df5a65f6bc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7cd42677f9c… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Aug 9 08:08:05 2020 +0200 Make test immune from LTO. --- m4/ac_check_fpu_control.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/ac_check_fpu_control.m4 b/m4/ac_check_fpu_control.m4 index 707dc7981..b69fa802d 100644 --- a/m4/ac_check_fpu_control.m4 +++ b/m4/ac_check_fpu_control.m4 @@ -49,9 +49,9 @@ main() { #else - float nf1 = -3, pf1 = 3, f2 = 5; - double nd1 = -7, pd1 = 7, d2 = 11; -long double nl1 = -13, pl1 = 13, l2 = 17; + volatile float nf1 = -3, pf1 = 3, f2 = 5; + volatile double nd1 = -7, pd1 = 7, d2 = 11; +volatile long double nl1 = -13, pl1 = 13, l2 = 17; float nf[2], pf[2]; double nd[2], pd[2];

1 0

[GIT] ppl/ppl(devel): Avoid using reserved identifiers.
by Roberto Bagnara 08 Aug '20

08 Aug '20

Module: ppl/ppl Branch: devel Commit: c42972fa56cd3edc781fb785c4f13f5dd3346422 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c42972fa56cd… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Aug 8 20:55:00 2020 +0200 Avoid using reserved identifiers. --- configure.ac | 11 +---------- demos/ppl_lpsol/ppl_lpsol.c | 8 ++++---- ppl-config.sed | 6 +++--- tests/ppl_test.hh | 8 ++++---- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/configure.ac b/configure.ac index a0e7e2ef0..5c17a0c24 100644 --- a/configure.ac +++ b/configure.ac @@ -106,16 +106,7 @@ AH_BOTTOM([ # define NDEBUG PPL_NDEBUG #endif -/* In order for the definition of `int64_t' to be seen by Comeau C/C++, - we must make sure <stdint.h> is included before <sys/types.hh> is - (even indirectly) included. Moreover we need to define - __STDC_LIMIT_MACROS before the first inclusion of <stdint.h> - in order to have the macros defined also in C++. */ - #ifdef PPL_HAVE_STDINT_H -# ifndef __STDC_LIMIT_MACROS -# define __STDC_LIMIT_MACROS 1 -# endif # include <stdint.h> #endif @@ -1561,7 +1552,7 @@ then #endif ]) AC_CHECK_FUNC(_glp_lib_print_hook, - AC_DEFINE(PPL_GLPK_HAS__GLP_LIB_PRINT_HOOK, + AC_DEFINE(PPL_GLPK_HAS_GLP_LIB_PRINT_HOOK, 1, [Defined if GLPK provides _glp_lib_print_hook().])) AC_CHECK_DECL(glp_term_out, diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 9bbfebf3c..9f2deba7f 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -1273,7 +1273,7 @@ error_handler(enum ppl_enum_error_code code, #if !(defined(PPL_GLPK_HAS_GLP_TERM_OUT) && defined(GLP_OFF)) #if defined(PPL_GLPK_HAS_GLP_TERM_HOOK) \ - || defined(PPL_GLPK_HAS__GLP_LIB_PRINT_HOOK) + || defined(PPL_GLPK_HAS_GLP_LIB_PRINT_HOOK) static int glpk_message_interceptor(void* info, const char* msg) { @@ -1292,7 +1292,7 @@ glpk_message_interceptor(void* info, char* msg) { } #endif /* !(defined(PPL_GLPK_HAS_GLP_TERM_HOOK) - || defined(PPL_GLPK_HAS__GLP_LIB_PRINT_HOOK)) + || defined(PPL_GLPK_HAS_GLP_LIB_PRINT_HOOK)) && defined(PPL_GLPK_HAS_LIB_SET_PRINT_HOOK) */ #endif /* !(defined(PPL_GLPK_HAS_GLP_TERM_OUT) && defined(GLP_OFF)) */ @@ -1598,7 +1598,7 @@ main(int argc, char* argv[]) { struct timeval master_thread_time; #endif -#if defined(PPL_GLPK_HAS__GLP_LIB_PRINT_HOOK) +#if defined(PPL_GLPK_HAS_GLP_LIB_PRINT_HOOK) extern void _glp_lib_print_hook(int (*func)(void *info, const char *buf), void *info); #endif @@ -1626,7 +1626,7 @@ main(int argc, char* argv[]) { glp_term_out(GLP_OFF); #elif defined(PPL_GLPK_HAS_GLP_TERM_HOOK) glp_term_hook(glpk_message_interceptor, 0); -#elif defined(PPL_GLPK_HAS__GLP_LIB_PRINT_HOOK) +#elif defined(PPL_GLPK_HAS_GLP_LIB_PRINT_HOOK) _glp_lib_print_hook(glpk_message_interceptor, 0); #elif defined(PPL_GLPK_HAS_LIB_SET_PRINT_HOOK) lib_set_print_hook(0, glpk_message_interceptor); diff --git a/ppl-config.sed b/ppl-config.sed index dd94ee3f0..a37109046 100644 --- a/ppl-config.sed +++ b/ppl-config.sed @@ -48,9 +48,9 @@ s/$[^A-Z_]$HAVE_UINT_FAST32_T/\1PPL_HAVE_UINT_FAST32_T/g s/$[^A-Z_]$HAVE_UINT_FAST64_T/\1PPL_HAVE_UINT_FAST64_T/g s/$[^A-Z_]$HAVE_UINTPTR_T/\1PPL_HAVE_UINTPTR_T/g s/$[^A-Z_]$HAVE_UNISTD_H/\1PPL_HAVE_UNISTD_H/g -s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_ALLOC/\1PPL_HAVE___MPZ_STRUCT__MP_ALLOC/g -s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_D/\1PPL_HAVE___MPZ_STRUCT__MP_D/g -s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_SIZE/\1PPL_HAVE___MPZ_STRUCT__MP_SIZE/g +s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_ALLOC/\1PPL_HAVE_MPZ_STRUCT_MP_ALLOC/g +s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_D/\1PPL_HAVE_MPZ_STRUCT_MP_D/g +s/$[^A-Z_]$HAVE___MPZ_STRUCT__MP_SIZE/\1PPL_HAVE_MPZ_STRUCT_MP_SIZE/g s/$[^A-Z_]$PACKAGE_BUGREPORT/\1PPL_PACKAGE_BUGREPORT/g s/$[^A-Z_]$PACKAGE_NAME/\1PPL_PACKAGE_NAME/g s/$[^A-Z_]$PACKAGE_STRING/\1PPL_PACKAGE_STRING/g diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index fbee295cf..67789f2f7 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -201,15 +201,15 @@ catch (const std::exception& e) { \ #define PPL_CPP_IS_NEGx_arg_neg 0)(0 #define PPL_CPP_IS_NEGx(v) PPL_CPP_VAL_a(PPL_CPP_IS_NEGx_arg_##v) -#define PPL_CPP_IS_NEG__(v) v ## _ -#define PPL_CPP_IS_NEG_(v) PPL_CPP_IS_NEG__(v) +#define PPL_CPP_IS_NEG_p(v) v ## _ +#define PPL_CPP_IS_NEG_(v) PPL_CPP_IS_NEG_p(v) #define PPL_CPP_IS_NEG(v) PPL_CPP_IS_NEG_(PPL_CPP_IS_NEGx(v)) #define PPL_CPP_IS_ZEROx_arg_0 0)(0 #define PPL_CPP_IS_ZEROx(v) PPL_CPP_VAL_a(PPL_CPP_IS_ZEROx_arg_##v) -#define PPL_CPP_IS_ZERO__(v) v ## _ -#define PPL_CPP_IS_ZERO_(v) PPL_CPP_IS_ZERO__(v) +#define PPL_CPP_IS_ZERO_p(v) v ## _ +#define PPL_CPP_IS_ZERO_(v) PPL_CPP_IS_ZERO_p(v) #define PPL_CPP_IS_ZERO(v) PPL_CPP_IS_ZERO_(PPL_CPP_IS_ZEROx(v)) #define PPL_CPP_DECR_neg neg

1 0

[GIT] ppl/ppl(devel): Empty expression statements avoided.
by Roberto Bagnara 08 Aug '20

08 Aug '20

Module: ppl/ppl Branch: devel Commit: f8e843267a401af6215fbda4fcb76cc13ec67fe0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f8e843267a40… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Aug 8 19:43:58 2020 +0200 Empty expression statements avoided. --- tests/BD_Shape/constrains1.cc | 26 +++++++++++-------- tests/Box/constrains1.cc | 26 +++++++++++-------- tests/Octagonal_Shape/constrains1.cc | 26 +++++++++++-------- tests/Partially_Reduced_Product/bounds1.cc | 2 +- tests/Polyhedron/maxspacedim1.cc | 40 ++++++++++++++++++------------ 5 files changed, 70 insertions(+), 50 deletions(-) diff --git a/tests/BD_Shape/constrains1.cc b/tests/BD_Shape/constrains1.cc index 9493731ad..d085325ac 100644 --- a/tests/BD_Shape/constrains1.cc +++ b/tests/BD_Shape/constrains1.cc @@ -23,17 +23,21 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#define TEST_PREDICATE_TRUE(pred) \ - if (!pred) { \ - nout << "!" #pred << endl; \ - ok = false; \ - } - -#define TEST_PREDICATE_FALSE(pred) \ - if (pred) { \ - nout << #pred << endl; \ - ok = false; \ - } +#define TEST_PREDICATE_TRUE(pred) \ + do { \ + if (!pred) { \ + nout << "!" #pred << endl; \ + ok = false; \ + } \ + } while (false) + +#define TEST_PREDICATE_FALSE(pred) \ + do { \ + if (pred) { \ + nout << #pred << endl; \ + ok = false; \ + } \ + } while (false) namespace { diff --git a/tests/Box/constrains1.cc b/tests/Box/constrains1.cc index 0284b33d2..2dd551b04 100644 --- a/tests/Box/constrains1.cc +++ b/tests/Box/constrains1.cc @@ -23,17 +23,21 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#define TEST_PREDICATE_TRUE(pred) \ - if (!pred) { \ - nout << "!" #pred << endl; \ - ok = false; \ - } - -#define TEST_PREDICATE_FALSE(pred) \ - if (pred) { \ - nout << #pred << endl; \ - ok = false; \ - } +#define TEST_PREDICATE_TRUE(pred) \ + do { \ + if (!pred) { \ + nout << "!" #pred << endl; \ + ok = false; \ + } \ + } while (false) + +#define TEST_PREDICATE_FALSE(pred) \ + do { \ + if (pred) { \ + nout << #pred << endl; \ + ok = false; \ + } \ + } while (false) namespace { diff --git a/tests/Octagonal_Shape/constrains1.cc b/tests/Octagonal_Shape/constrains1.cc index f5d8d56ea..00b4c5287 100644 --- a/tests/Octagonal_Shape/constrains1.cc +++ b/tests/Octagonal_Shape/constrains1.cc @@ -23,17 +23,21 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#define TEST_PREDICATE_TRUE(pred) \ - if (!pred) { \ - nout << "!" #pred << endl; \ - ok = false; \ - } - -#define TEST_PREDICATE_FALSE(pred) \ - if (pred) { \ - nout << #pred << endl; \ - ok = false; \ - } +#define TEST_PREDICATE_TRUE(pred) \ + do { \ + if (!pred) { \ + nout << "!" #pred << endl; \ + ok = false; \ + } \ + } while (false) + +#define TEST_PREDICATE_FALSE(pred) \ + do { \ + if (pred) { \ + nout << #pred << endl; \ + ok = false; \ + } \ + } while (false) namespace { diff --git a/tests/Partially_Reduced_Product/bounds1.cc b/tests/Partially_Reduced_Product/bounds1.cc index 1ae3d2f03..2fb4284f1 100644 --- a/tests/Partially_Reduced_Product/bounds1.cc +++ b/tests/Partially_Reduced_Product/bounds1.cc @@ -252,7 +252,7 @@ test11() { prp.refine_with_constraint(A - B <= 1); #endif prp.refine_with_congruence(3*B %= 2); -; + Linear_Expression le = A - B; Coefficient max_n; diff --git a/tests/Polyhedron/maxspacedim1.cc b/tests/Polyhedron/maxspacedim1.cc index b593686d8..176212670 100644 --- a/tests/Polyhedron/maxspacedim1.cc +++ b/tests/Polyhedron/maxspacedim1.cc @@ -23,26 +23,29 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" -#define test01_DO_CLASS(T) \ - nout << #T "::max_space_dimension() = " \ - << T::max_space_dimension() << endl; \ - if (T::max_space_dimension() < max_space_dimension()) \ - return false +#define test01_DO_CLASS(T) \ + do { \ + nout << #T "::max_space_dimension() = " \ + << T::max_space_dimension() << endl; \ + if (T::max_space_dimension() < max_space_dimension()) { \ + return false; \ + } \ + } while (false) #if PPL_SUPPORTED_FLOAT #define test01_DO_WRD_FLOAT(WRD) test01_DO_CLASS(WRD<float>) #else -#define test01_DO_WRD_FLOAT(WRD) +#define test01_DO_WRD_FLOAT(WRD) do { } while (false) #endif #if PPL_SUPPORTED_DOUBLE #define test01_DO_WRD_DOUBLE(WRD) test01_DO_CLASS(WRD<double>) #else -#define test01_DO_WRD_DOUBLE(WRD) +#define test01_DO_WRD_DOUBLE(WRD) do { } while (false) #endif #if PPL_SUPPORTED_LONG_DOUBLE #define test01_DO_WRD_LONG_DOUBLE(WRD) test01_DO_CLASS(WRD<long double>) #else -#define test01_DO_WRD_LONG_DOUBLE(WRD) +#define test01_DO_WRD_LONG_DOUBLE(WRD) do { } while (false) #endif #define test01_DO_WRD(WRD) \ @@ -57,28 +60,34 @@ site: http://bugseng.com/products/ppl/ . */ test01_DO_WRD_LONG_DOUBLE(WRD) #define test01_DO_CONSTR_CLASS(CONSTR, T) \ - nout << #CONSTR "<" #T ">::max_space_dimension() = " \ - << CONSTR<T>::max_space_dimension() << endl; \ - if (CONSTR<T>::max_space_dimension() < max_space_dimension()) \ - return false + do { \ + nout << #CONSTR "<" #T ">::max_space_dimension() = " \ + << CONSTR<T>::max_space_dimension() << endl; \ + if (CONSTR<T>::max_space_dimension() < max_space_dimension()) { \ + return false; \ + } \ + } while (false) #if PPL_SUPPORTED_FLOAT #define test01_DO_CONSTR_WRD_FLOAT(CONSTR, WRD) \ test01_DO_CONSTR_CLASS(CONSTR, WRD<float>) #else -#define test01_DO_CONSTR_WRD_FLOAT(CONSTR, WRD) +#define test01_DO_CONSTR_WRD_FLOAT(CONSTR, WRD) \ + do { } while (false) #endif #if PPL_SUPPORTED_DOUBLE #define test01_DO_CONSTR_WRD_DOUBLE(CONSTR, WRD) \ test01_DO_CONSTR_CLASS(CONSTR, WRD<double>) #else -#define test01_DO_CONSTR_WRD_DOUBLE(CONSTR, WRD) +#define test01_DO_CONSTR_WRD_DOUBLE(CONSTR, WRD) \ + do { } while (false) #endif #if PPL_SUPPORTED_LONG_DOUBLE #define test01_DO_CONSTR_WRD_LONG_DOUBLE(CONSTR, WRD) \ test01_DO_CONSTR_CLASS(CONSTR, WRD<long double>) #else -#define test01_DO_CONSTR_WRD_LONG_DOUBLE(CONSTR, WRD) +#define test01_DO_CONSTR_WRD_LONG_DOUBLE(CONSTR, WRD) \ + do { } while (false) #endif #define test01_DO_CONSTR_WRD(CONSTR, WRD) \ @@ -134,4 +143,3 @@ test01() { BEGIN_MAIN DO_TEST(test01); END_MAIN -

1 0

[GIT] ppl/ppl(devel): Empty expression statements avoided.
by Roberto Bagnara 08 Aug '20

08 Aug '20

Module: ppl/ppl Branch: devel Commit: 726b6e3fbbd7e95689ec15273dc0567c8baf9292 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=726b6e3fbbd7… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Aug 8 18:35:14 2020 +0200 Empty expression statements avoided. --- tests/BD_Shape/boundedaffinepreimage1.cc | 2 +- tests/Grid/congruences2.cc | 2 +- tests/Grid/fromgrid1.cc | 4 ++-- tests/Grid/grid2.cc | 2 +- tests/Octagonal_Shape/generalizedaffineimage4.cc | 2 +- tests/Polyhedron/constrains1.cc | 20 ++++++++++++-------- tests/Polyhedron/memory2.cc | 12 +++++++----- tests/Powerset/relationwith1.cc | 4 ++-- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/tests/BD_Shape/boundedaffinepreimage1.cc b/tests/BD_Shape/boundedaffinepreimage1.cc index 62527722c..12b7ab39c 100644 --- a/tests/BD_Shape/boundedaffinepreimage1.cc +++ b/tests/BD_Shape/boundedaffinepreimage1.cc @@ -270,7 +270,7 @@ test09() { bds.add_constraint(A - B <= 2); bds.add_constraint(A - B >= -2); - print_constraints(bds, "*** bds ***");; + print_constraints(bds, "*** bds ***"); BD_Shape<mpq_class> known_result(2); known_result.add_constraint(4*A >= -5); diff --git a/tests/Grid/congruences2.cc b/tests/Grid/congruences2.cc index b8453e864..78a206d8c 100644 --- a/tests/Grid/congruences2.cc +++ b/tests/Grid/congruences2.cc @@ -60,7 +60,7 @@ test01() { ok &= !(cgs2 == cgs0) && !(cgs2 == cgs1); print_congruences(cgs2, "*** cgs2((A - 3*B %= 5) / 2) ***"); - }; + } return ok; } diff --git a/tests/Grid/fromgrid1.cc b/tests/Grid/fromgrid1.cc index 4767b314d..d5c73d307 100644 --- a/tests/Grid/fromgrid1.cc +++ b/tests/Grid/fromgrid1.cc @@ -56,7 +56,7 @@ test01() { ok &= (gr_copy == known_gr); print_generators(gr_copy, "*** gr_copy ***"); } - }; + } return ok; } @@ -89,7 +89,7 @@ test02() { ok &= (gr_copy == known_gr); print_generators(gr_copy, "*** gr_copy ***"); } - }; + } return ok; } diff --git a/tests/Grid/grid2.cc b/tests/Grid/grid2.cc index 7d422ca7b..24848dd7d 100644 --- a/tests/Grid/grid2.cc +++ b/tests/Grid/grid2.cc @@ -589,7 +589,7 @@ test21() { bool test22() { Variable A(0); - Variable B(1);; + Variable B(1); Congruence_System cgs1(0*A == 0); cgs1.insert(0*B == 0); diff --git a/tests/Octagonal_Shape/generalizedaffineimage4.cc b/tests/Octagonal_Shape/generalizedaffineimage4.cc index 58b92a6dd..4b17e5e95 100644 --- a/tests/Octagonal_Shape/generalizedaffineimage4.cc +++ b/tests/Octagonal_Shape/generalizedaffineimage4.cc @@ -176,7 +176,7 @@ test06() { print_constraints(oct, "*** oct ***"); Octagonal_Shape<mpq_class> known_result(3); - known_result.add_constraint(A <= 1);; + known_result.add_constraint(A <= 1); oct.generalized_affine_image(e1, LESS_OR_EQUAL, e2); diff --git a/tests/Polyhedron/constrains1.cc b/tests/Polyhedron/constrains1.cc index afdb580f3..8ae1f5acc 100644 --- a/tests/Polyhedron/constrains1.cc +++ b/tests/Polyhedron/constrains1.cc @@ -24,16 +24,20 @@ site: http://bugseng.com/products/ppl/ . */ #include "ppl_test.hh" #define TEST_PREDICATE_TRUE(pred) \ - if (!pred) { \ - nout << "!" #pred << endl; \ - ok = false; \ - } + do { \ + if (!pred) { \ + nout << "!" #pred << endl; \ + ok = false; \ + } \ + } while (false) #define TEST_PREDICATE_FALSE(pred) \ - if (pred) { \ - nout << #pred << endl; \ - ok = false; \ - } + do { \ + if (pred) { \ + nout << #pred << endl; \ + ok = false; \ + } \ + } while (false) namespace { diff --git a/tests/Polyhedron/memory2.cc b/tests/Polyhedron/memory2.cc index 1970d5ce8..7994dd3c2 100644 --- a/tests/Polyhedron/memory2.cc +++ b/tests/Polyhedron/memory2.cc @@ -226,11 +226,13 @@ test3() { } // namespace #define IGNORE_OVERFLOWS(fun) \ - try { \ - fun; \ - } \ - catch (const std::overflow_error&) { \ - } + do { \ + try { \ + fun; \ + } \ + catch (const std::overflow_error&) { \ + } \ + } while (false) extern "C" void ppl_set_GMP_memory_allocation_functions() { diff --git a/tests/Powerset/relationwith1.cc b/tests/Powerset/relationwith1.cc index 7d55ba26a..837043c19 100644 --- a/tests/Powerset/relationwith1.cc +++ b/tests/Powerset/relationwith1.cc @@ -39,7 +39,7 @@ test01() { Poly_Con_Relation known_rel = Poly_Con_Relation::saturates() && Poly_Con_Relation::is_included(); - bool ok = (rel == known_rel);; + bool ok = (rel == known_rel); return ok && ps.OK(); } @@ -132,7 +132,7 @@ test05() { Poly_Con_Relation known_rel = Poly_Con_Relation::saturates() && Poly_Con_Relation::is_included(); - bool ok = (rel == known_rel);; + bool ok = (rel == known_rel); return ok && ps.OK(); }

1 0

[GIT] ppl/ppl(devel): Empty expression statements avoided.
by Roberto Bagnara 06 Aug '20

06 Aug '20

Module: ppl/ppl Branch: devel Commit: b10f76b0260b1cb47c29be2b511127c67aedcc7d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b10f76b0260b… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Aug 6 16:31:44 2020 +0200 Empty expression statements avoided. --- tests/BD_Shape/max_min1.cc | 2 +- tests/ppl_test.hh | 100 ++++++++++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/tests/BD_Shape/max_min1.cc b/tests/BD_Shape/max_min1.cc index e0cf68421..525244da1 100644 --- a/tests/BD_Shape/max_min1.cc +++ b/tests/BD_Shape/max_min1.cc @@ -773,7 +773,7 @@ BEGIN_MAIN DO_TEST(test13); DO_TEST(test14); DO_TEST(test15); - DO_TEST(test16);; + DO_TEST(test16); DO_TEST(test17); DO_TEST(test18); DO_TEST(test19); diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index 5e78f0f6f..fbee295cf 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -105,54 +105,70 @@ catch (const std::exception& e) { \ nout << "\n=== " #test " ===" << std::endl #define RUN_TEST(test) \ - try { \ - overflow = false; \ - succeeded = test(); \ - } \ - catch (const std::overflow_error& e) { \ - nout << "arithmetic overflow (" << e.what() << ")" \ - << std::endl; \ - overflow = true; \ - succeeded = false; \ - } \ - catch (const std::exception& e) { \ - nout << "std::exception caught: " \ - << e.what() << " (type == " << typeid(e).name() << ")" \ - << std::endl; \ - succeeded = false; \ - } \ - catch (...) { \ - nout << "unknown exception caught" \ - << std::endl; \ - succeeded = false; \ - } - -#define DO_TEST(test) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (!succeeded) \ - failed_tests.push_back(#test); + do { \ + try { \ + overflow = false; \ + succeeded = test(); \ + } \ + catch (const std::overflow_error& e) { \ + nout << "arithmetic overflow (" << e.what() << ")" \ + << std::endl; \ + overflow = true; \ + succeeded = false; \ + } \ + catch (const std::exception& e) { \ + nout << "std::exception caught: " \ + << e.what() << " (type == " << typeid(e).name() << ")" \ + << std::endl; \ + succeeded = false; \ + } \ + catch (...) { \ + nout << "unknown exception caught" \ + << std::endl; \ + succeeded = false; \ + } \ + } while (false) + +#define DO_TEST(test) \ + do { \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (!succeeded) { \ + failed_tests.push_back(#test); \ + } \ + } while (false) #define DO_TEST_F(test) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (succeeded) \ - unexpectedly_succeeded_tests.push_back(#test); + do { \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (succeeded) { \ + unexpectedly_succeeded_tests.push_back(#test); \ + } \ + } while (false) #define DO_TEST_OVERFLOW(test) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (succeeded) \ - unexpectedly_succeeded_tests.push_back(#test); \ - else if (!overflow) \ - failed_tests.push_back(#test); + do { \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (succeeded) { \ + unexpectedly_succeeded_tests.push_back(#test); \ + } \ + else if (!overflow) { \ + failed_tests.push_back(#test); \ + } \ + } while (false) #define DO_TEST_MAY_OVERFLOW_IF_INEXACT(test, shape) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (!succeeded) \ - if (!overflow || has_exact_coefficient_type(shape(0, EMPTY))) \ - failed_tests.push_back(#test); + do { \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (!succeeded) { \ + if (!overflow || has_exact_coefficient_type(shape(0, EMPTY))) { \ + failed_tests.push_back(#test); \ + } \ + } \ + } while (false) // Macros for arbitrary combination of preprocessor conditions.

1 0

[GIT] ppl/ppl(devel): Consistently represent the intentionality of fall-through for switch cases.
by Roberto Bagnara 06 Aug '20

06 Aug '20

Module: ppl/ppl Branch: devel Commit: 6fce710c637aba66cc9d8b7fbb2e9570e29cb4ce URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6fce710c637a… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Aug 6 14:49:11 2020 +0200 Consistently represent the intentionality of fall-through for switch cases. --- src/BD_Shape_templates.hh | 3 ++- src/BHRZ03_Certificate.cc | 6 ++---- src/Boundary_defs.hh | 12 ++++++++---- src/Constraint_System.cc | 3 +-- src/Generator.cc | 3 +-- src/Grid_conversion.cc | 3 ++- src/Grid_public.cc | 3 ++- src/Grid_simplify.cc | 6 ++++-- src/Interval_templates.hh | 4 ++++ src/MIP_Problem.cc | 18 ++++++------------ src/Octagonal_Shape_templates.hh | 3 ++- src/PIP_Problem.cc | 9 +++------ src/Polyhedron_nonpublic.cc | 3 +-- src/Polyhedron_public.cc | 6 ++---- src/checked.cc | 2 ++ src/compiler.hh | 10 ++++++++++ src/intervals_defs.hh | 9 ++++++--- 17 files changed, 58 insertions(+), 45 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=6fce710c…

1 0

[GIT] ppl/ppl(devel): Use nullptr.
by Roberto Bagnara 06 Aug '20

06 Aug '20

Module: ppl/ppl Branch: devel Commit: 095c34b19d2708c54d6ee13bddcaf75ba750cd71 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=095c34b19d27… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Aug 6 11:13:39 2020 +0200 Use nullptr. --- demos/ppl_lcdd/ppl_lcdd.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index c9a209ee1..8a2e79849 100755 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -1535,7 +1535,7 @@ main(int argc, char* argv[]) try { assert(input_file_names.size() <= 1); // Passing 0 means "read from stdin". - convert(input_file_names.empty() ? 0 : input_file_names.front()); + convert(input_file_names.empty() ? nullptr : input_file_names.front()); #endif // !MULTI_THREADED

1 0