- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(devel): Use size_t for Prolog terms arity.
by Abramo Bagnara 12 Feb '21

12 Feb '21

Module: ppl/ppl Branch: devel Commit: 047cdfd61b32f26e748189e859dbe113af714e8c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=047cdfd61b32… Author: Abramo Bagnara <abramo.bagnara(a)bugseng.com> Date: Fri Feb 12 13:12:34 2021 +0100 Use size_t for Prolog terms arity. --- interfaces/Prolog/Ciao/ciao_cfli.hh | 2 +- interfaces/Prolog/GNU/gprolog_cfli.hh | 6 ++++-- interfaces/Prolog/SICStus/sicstus_cfli.h | 2 +- interfaces/Prolog/SICStus/sicstus_cfli.ic | 7 +++++-- interfaces/Prolog/SWI/swi_cfli.hh | 11 ++++++++++- interfaces/Prolog/XSB/xsb_cfli.hh | 2 +- interfaces/Prolog/YAP/yap_cfli.hh | 2 +- .../Prolog/ppl_interface_generator_prolog_cc_code.m4 | 2 +- interfaces/Prolog/ppl_prolog_common.cc | 16 ++++++++-------- 9 files changed, 32 insertions(+), 18 deletions(-) diff --git a/interfaces/Prolog/Ciao/ciao_cfli.hh b/interfaces/Prolog/Ciao/ciao_cfli.hh index fcea5dcd0..f0159776f 100644 --- a/interfaces/Prolog/Ciao/ciao_cfli.hh +++ b/interfaces/Prolog/Ciao/ciao_cfli.hh @@ -306,7 +306,7 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ inline int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); *ap = ciao_structure_name(t); *ip = ciao_structure_arity(t); diff --git a/interfaces/Prolog/GNU/gprolog_cfli.hh b/interfaces/Prolog/GNU/gprolog_cfli.hh index b4f8490bf..b04c82601 100644 --- a/interfaces/Prolog/GNU/gprolog_cfli.hh +++ b/interfaces/Prolog/GNU/gprolog_cfli.hh @@ -420,9 +420,11 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ inline int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); - Rd_Compound_Check(t, ap, ip); + int i; + Rd_Compound_Check(t, ap, &i); + *ip = i; return 1; } diff --git a/interfaces/Prolog/SICStus/sicstus_cfli.h b/interfaces/Prolog/SICStus/sicstus_cfli.h index 2110c8c71..ef0cbbdb5 100644 --- a/interfaces/Prolog/SICStus/sicstus_cfli.h +++ b/interfaces/Prolog/SICStus/sicstus_cfli.h @@ -134,7 +134,7 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom& name); PCFLI_DECLSPEC int Prolog_get_compound_name_arity(Prolog_term_ref t, - Prolog_atom& name, int& arity); + Prolog_atom& name, size_t* arity); PCFLI_DECLSPEC int Prolog_get_arg(int i, Prolog_term_ref t, Prolog_term_ref a); diff --git a/interfaces/Prolog/SICStus/sicstus_cfli.ic b/interfaces/Prolog/SICStus/sicstus_cfli.ic index f9d5609ed..40d4efe19 100644 --- a/interfaces/Prolog/SICStus/sicstus_cfli.ic +++ b/interfaces/Prolog/SICStus/sicstus_cfli.ic @@ -262,9 +262,12 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ PCFLI_EXTERN_INLINE int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); - return SP_get_functor(t, ap, ip); + int i; + int r = SP_get_functor(t, ap, &i); + *ip = i; + return r; } /*! diff --git a/interfaces/Prolog/SWI/swi_cfli.hh b/interfaces/Prolog/SWI/swi_cfli.hh index 49cb7c5ed..2a82a323c 100644 --- a/interfaces/Prolog/SWI/swi_cfli.hh +++ b/interfaces/Prolog/SWI/swi_cfli.hh @@ -346,9 +346,18 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ inline int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); +#if PLVERSION >= 80129 return PL_get_name_arity(t, ap, ip); +#elif PLVERSION >= 70312 + return PL_get_name_arity_sz(t, ap, ip); +#else + int i; + if bool r = PL_get_name_arity(t, ap, &i); + *ip = i; + return r; +#endif } /*! diff --git a/interfaces/Prolog/XSB/xsb_cfli.hh b/interfaces/Prolog/XSB/xsb_cfli.hh index 314102200..cf1dc8a9b 100644 --- a/interfaces/Prolog/XSB/xsb_cfli.hh +++ b/interfaces/Prolog/XSB/xsb_cfli.hh @@ -314,7 +314,7 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ inline int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); *ap = p2c_functor(t); *ip = p2c_arity(t); diff --git a/interfaces/Prolog/YAP/yap_cfli.hh b/interfaces/Prolog/YAP/yap_cfli.hh index e3f978593..77e11ae6a 100644 --- a/interfaces/Prolog/YAP/yap_cfli.hh +++ b/interfaces/Prolog/YAP/yap_cfli.hh @@ -313,7 +313,7 @@ Prolog_get_atom_name(Prolog_term_ref t, Prolog_atom* ap) { The behavior is undefined if \p t is not a Prolog compound term. */ inline int -Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, int* ip) { +Prolog_get_compound_name_arity(Prolog_term_ref t, Prolog_atom* ap, size_t* ip) { assert(Prolog_is_compound(t)); YAP_Functor f = YAP_FunctorOfTerm(t); *ap = YAP_NameOfFunctor(f); diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index d722ad747..de9a1ad13 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1936,7 +1936,7 @@ m4_define(`ppl_@CLASS@_map_space_dimensions_code', while (Prolog_is_cons(t_pfunc)) { Prolog_get_cons(t_pfunc, t_pair, t_pfunc); Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t_pair, &functor, &arity); if (arity != 2 || functor != a_minus) return PROLOG_FAILURE; diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 9ae05ab1a..febced8d4 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -937,7 +937,7 @@ build_linear_expression(Prolog_term_ref t, const char* where) { return Linear_Expression(integer_term_to_Coefficient(t)); else if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); switch (arity) { case 1: @@ -1000,7 +1000,7 @@ Constraint build_constraint(Prolog_term_ref t, const char* where) { if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); if (arity == 2) { Prolog_term_ref arg1 = Prolog_new_term_ref(); @@ -1073,7 +1073,7 @@ Congruence build_congruence(Prolog_term_ref t, const char* where) { if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); if (arity == 2) { Prolog_term_ref arg1 = Prolog_new_term_ref(); @@ -1084,7 +1084,7 @@ build_congruence(Prolog_term_ref t, const char* where) { // / if (Prolog_is_integer(arg2)) { Prolog_atom functor1; - int arity1; + size_t arity1; Prolog_get_compound_name_arity(arg1, &functor1, &arity1); if (arity1 == 2) { if (functor1 == a_is_congruent_to) { @@ -1137,7 +1137,7 @@ Generator build_generator(Prolog_term_ref t, const char* where) { if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); if (arity == 1) { Prolog_term_ref arg = Prolog_new_term_ref(); @@ -1174,7 +1174,7 @@ Grid_Generator build_grid_generator(Prolog_term_ref t, const char* where) { if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); if (arity == 1) { Prolog_term_ref arg = Prolog_new_term_ref(); @@ -1406,7 +1406,7 @@ Variable term_to_Variable(Prolog_term_ref t, const char* where) { if (Prolog_is_compound(t)) { Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t, &functor, &arity); if (functor == a_dollar_VAR && arity == 1) { Prolog_term_ref arg = Prolog_new_term_ref(); @@ -1554,7 +1554,7 @@ term_to_boundary(Prolog_term_ref t_b, Boundary_Kind kind, return false; Prolog_atom functor; - int arity; + size_t arity; Prolog_get_compound_name_arity(t_b, &functor, &arity); // A boundary term is either of the form c(Limit) or o(Limit).

1 0

[GIT] ppl/ppl(devel): Updated Ciao Prolog interface tests
by Jose F. Morales 28 Dec '20

28 Dec '20

Module: ppl/ppl Branch: devel Commit: 498d29b64159101908b7f5e61a8a69f0b4e7d1bd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=498d29b64159… Author: Jose F. Morales <jfmcjf(a)gmail.com> Date: Mon Dec 28 17:18:35 2020 +0100 Updated Ciao Prolog interface tests --- interfaces/Prolog/Ciao/ciao_pl_check.pl | 260 +++++++++++---------- ...face_generator_ciao_prolog_generated_test_pl.m4 | 6 +- 2 files changed, 137 insertions(+), 129 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=498d29b6…

1 0

[GIT] ppl/ppl(devel): Added a missing dependency.
by Roberto Bagnara 28 Dec '20

28 Dec '20

Module: ppl/ppl Branch: devel Commit: 0100f68966da8e54cc19de9ad166e297e7c5db99 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0100f68966da… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Mon Dec 28 16:00:38 2020 +0100 Added a missing dependency. --- interfaces/Prolog/Ciao/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index a1f985a6f..477682981 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -171,7 +171,7 @@ ciao_prolog_generated_test.pl: $(interface_generator_dependencies) $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ $(srcdir)/ppl_interface_generator_ciao_prolog_generated_test_pl.m4 > $@ -ppl_ciao.po: ppl_ciao.pl +ppl_ciao.po: .libs/libppl_ciao.so ppl_ciao.pl ciaoc -c ppl_ciao.pl # All the invocations of `ciaoc' to build `ciao_pl_check', `ciao_clpq',

1 0

[GIT] ppl/ppl(devel): Updated interface Ciao Prolog
by Jose F. Morales 28 Dec '20

28 Dec '20

Module: ppl/ppl Branch: devel Commit: 80e0815f7b54f48c70b2a70ec7ea1fa148f55c15 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=80e0815f7b54… Author: Jose F. Morales <jfmcjf(a)gmail.com> Date: Mon Dec 28 13:46:16 2020 +0100 Updated interface Ciao Prolog --- interfaces/Prolog/Ciao/Makefile.am | 2 +- .../Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 | 26 +++------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index bd74b5ac0..a1f985a6f 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -158,7 +158,7 @@ libppl_ciao_la_DEPENDENCIES = \ libppl_ciao_la_LDFLAGS = \ $(NO_UNDEFINED_FLAG) \ --module \ +-shared \ -avoid-version pkgdata_DATA = ppl_ciao.po diff --git a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 index c0c4146fc..705990d50 100644 --- a/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 +++ b/interfaces/Prolog/Ciao/ppl_interface_generator_ciao_pl.m4 @@ -32,29 +32,14 @@ m4_divert`'dnl m4_include(`ppl_interface_generator_copyright')dnl */ -:- export( -[ -m4_divert(1) -]). - -:- use_package([ - assertions, - basicmodes, - regtypes, - foreign_interface -]). +:- module(_, [ +m4_divert(1)dnl +], [assertions, basicmodes, regtypes, foreign_interface]). m4_divert(2)dnl :- extra_linker_opts('-L.libs'). :- use_foreign_library(ppl_ciao). -:- impl_defined( -[ -m4_divert(3) -]). - -:- comment(version_maintenance,off). - m4_divert`'dnl m4_define(`m4_expanded_procedure_schema', `m4_ifelse($4, 0, , `COMMA ') $1/$2')dnl @@ -80,10 +65,5 @@ $1`'m4_ifelse(`$2', 0, ,`(m4_term_sequence($2, `term'))') :- ')')dnl ppl_prolog_sys_code`'dnl m4_undivert(2)dnl -m4_divert`'dnl -m4_define(`m4_expanded_procedure_schema', - `m4_ifelse(check_fail($3), nofail, ,m4_ifelse($4, 0, , `COMMA -') `'$1_2/m4_incr($2))')dnl -m4_patsubst(ppl_prolog_sys_code, COMMA, `,')`'dnl dnl dnl End of file generation.

1 0

PPL compilation error
by Mathieu Dutour 01 Dec '20

01 Dec '20

Dear authors of PPL, I have following compilation error for Parma Polyhedral Library 1.2 on Macintosh: ./OR_Matrix_inlines.hh:100:8: error: missing 'typename' prior to dependent type template name 'OR_Matrix<T>::Pseudo_Row' inline OR_Matrix<T>::Pseudo_Row<U>& (base) ➜ ppl-1.2 g++ -v Configured with: --prefix=/Library/Developer/CommandLineTools/usr --with-gxx-include-dir=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/4.2.1 Apple clang version 11.0.3 (clang-1103.0.32.59) Target: x86_64-apple-darwin20.1.0 Thread model: posix InstalledDir: /Library/Developer/CommandLineTools/usr/bin -------- I originally send my bugreport to support(a)bugseng.com and Roberto Bagnara told me that this error is likely corrected long ago on the git repository. I tried compiling that one. I get an error in "src/BUGS.cc" with BUGS.cc:25:3: error: use of undeclared identifier 'nullptr' -------- Let me know how I can help you fixing those issues. Mathieu

2 1

[GIT] ppl/ppl(devel): Added missing inclusion of "thread_safe.hh".
by Roberto Bagnara 01 Nov '20

01 Nov '20

Module: ppl/ppl Branch: devel Commit: ba0722934aac3da89d42c4f4e36530b083ade145 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba0722934aac… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Nov 1 17:15:17 2020 +0100 Added missing inclusion of "thread_safe.hh". --- src/fpu-ia32_inlines.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fpu-ia32_inlines.hh b/src/fpu-ia32_inlines.hh index a32c065bb..695438333 100644 --- a/src/fpu-ia32_inlines.hh +++ b/src/fpu-ia32_inlines.hh @@ -24,6 +24,7 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_fpu_ia32_inlines_hh #define PPL_fpu_ia32_inlines_hh 1 +#include "thread_safe.hh" #include <csetjmp> #include <csignal>

1 0

[GIT] ppl/ppl(devel): Removed wrong constexpr.
by Abramo Bagnara 01 Nov '20

01 Nov '20

Module: ppl/ppl Branch: devel Commit: 8e324b188d2f7d15042623bdb14816fd5c2aaaa3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8e324b188d2f… Author: Abramo Bagnara <abramo.bagnara(a)bugseng.com> Date: Sun Nov 1 16:42:17 2020 +0100 Removed wrong constexpr. --- src/Box_Status_idefs.hh | 2 +- src/OR_Matrix_defs.hh | 2 +- src/iterator_to_const_defs.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Box_Status_idefs.hh b/src/Box_Status_idefs.hh index 3a70108f5..78c449aea 100644 --- a/src/Box_Status_idefs.hh +++ b/src/Box_Status_idefs.hh @@ -51,7 +51,7 @@ public: Status(const Status& y); //! Assignment operator. - constexpr Status& operator=(const Status& y) = default; + Status& operator=(const Status& y) = default; //! Copy constructor from a box of different type. template <typename Other_ITV> diff --git a/src/OR_Matrix_defs.hh b/src/OR_Matrix_defs.hh index 0b036c613..734eb5877 100644 --- a/src/OR_Matrix_defs.hh +++ b/src/OR_Matrix_defs.hh @@ -129,7 +129,7 @@ private: Pseudo_Row(); //! Copy constructor. - constexpr Pseudo_Row(const Pseudo_Row& y) = default; + Pseudo_Row(const Pseudo_Row& y) = default; //! Assignment operator. Pseudo_Row& operator=(const Pseudo_Row& y); diff --git a/src/iterator_to_const_defs.hh b/src/iterator_to_const_defs.hh index d7272c521..7924385b4 100644 --- a/src/iterator_to_const_defs.hh +++ b/src/iterator_to_const_defs.hh @@ -155,7 +155,7 @@ public: const_iterator_to_const(const const_iterator_to_const& y); //! Assignment operator. - constexpr const_iterator_to_const& + const_iterator_to_const& operator=(const const_iterator_to_const& y) = default; //! Constructs from the corresponding non-const iterator.

1 0

[GIT] ppl/ppl(devel): Improved support for cross-compilation.
by Roberto Bagnara 01 Nov '20

01 Nov '20

Module: ppl/ppl Branch: devel Commit: c72beb5765670121435d230a9b31d3f6a8c49d09 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c72beb576567… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Nov 1 16:02:59 2020 +0100 Improved support for cross-compilation. --- m4/ac_check_swi_prolog.m4 | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index 04c8309ff..a4b173e9b 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -45,11 +45,21 @@ then fi if test x$swi_prolog != x then - swi_prolog_base=`$swi_prolog --dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$[[a-z]]:$\{0,1\}$.*$";.*/\2/'` - swi_prolog_version=`$swi_prolog --dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="$.*$";.*/\1/'` - swi_prolog_arch=`$swi_prolog --dump-runtime-variables | grep PLARCH= | sed 's/PLARCH="$.*$";.*/\1/'` - swi_prolog_libs=`$swi_prolog --dump-runtime-variables | grep PLLIBS= | sed 's/PLLIBS="$.*$";.*/\1/'` - swi_prolog_lib=`$swi_prolog --dump-runtime-variables | grep PLLIB= | sed 's/PLLIB="$.*$";.*/\1/'` + case $host_os in + *mingw*) + if test "$cross_compiling" = yes + then + EXEINTERPRETER=wine + fi + ;; + *) + ;; + esac + swi_prolog_base=`$EXEINTERPRETER $swi_prolog --dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$[[a-z]]:$\{0,1\}$.*$";.*/\2/'` + swi_prolog_version=`$EXEINTERPRETER $swi_prolog --dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="$.*$";.*/\1/'` + swi_prolog_arch=`$EXEINTERPRETER $swi_prolog --dump-runtime-variables | grep PLARCH= | sed 's/PLARCH="$.*$";.*/\1/'` + swi_prolog_libs=`$EXEINTERPRETER $swi_prolog --dump-runtime-variables | grep PLLIBS= | sed 's/PLLIBS="$.*$";.*/\1/'` + swi_prolog_lib=`$EXEINTERPRETER $swi_prolog --dump-runtime-variables | grep PLLIB= | sed 's/PLLIB="$.*$";.*/\1/'` dnl Additional version checks could be inserted here, if necessary.

1 0

[GIT] ppl/ppl(devel): Use AC_LINK_IFELSE instead of deprecated AC_TRY_LINK.
by Roberto Bagnara 16 Oct '20

16 Oct '20

Module: ppl/ppl Branch: devel Commit: a69a1f6469355b66af9bf10536dc79af647020a6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a69a1f646935… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Fri Oct 16 10:13:12 2020 +0200 Use AC_LINK_IFELSE instead of deprecated AC_TRY_LINK. --- m4/ppl.m4 | 8 ++++---- m4/ppl_c.m4 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/m4/ppl.m4 b/m4/ppl.m4 index 2b1d7a0e9..31476c286 100644 --- a/m4/ppl.m4 +++ b/m4/ppl.m4 @@ -247,14 +247,14 @@ else echo "*** Could not run PPL test program, checking why..." CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" LDFLAGS="$LDFLAGS $PPL_LDFLAGS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <ppl.hh> using namespace Parma_Polyhedra_Library; -], -[ +]], +[[ return version_major() || version_minor() || version_revision() || version_beta(); -], +]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding the PPL or finding the" diff --git a/m4/ppl_c.m4 b/m4/ppl_c.m4 index 968c0cab0..3daa71ee5 100644 --- a/m4/ppl_c.m4 +++ b/m4/ppl_c.m4 @@ -246,13 +246,13 @@ else echo "*** Could not run PPL test program, checking why..." CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" LDFLAGS="$LDFLAGS $PPL_LDFLAGS" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <ppl_c.h> -], -[ +]], +[[ return ppl_version_major() || ppl_version_minor() || ppl_version_revision() || ppl_version_beta(); -], +]])], [ echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding the PPL or finding the"

1 0

[GIT] ppl/ppl(devel): Further adaptation.
by Roberto Bagnara 09 Oct '20

09 Oct '20

Module: ppl/ppl Branch: devel Commit: 733b88010c29400a44b4b85388dd0da82f61355b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=733b88010c29… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Fri Oct 9 19:15:11 2020 +0200 Further adaptation. --- ECLAIR/analyze.sh.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ECLAIR/analyze.sh.in b/ECLAIR/analyze.sh.in index 803a97e41..e09858dd6 100644 --- a/ECLAIR/analyze.sh.in +++ b/ECLAIR/analyze.sh.in @@ -35,9 +35,10 @@ export ECLAIR_PROJECT_ROOT="@abs_top_srcdir@" export ECLAIR_OUTPUT_DIR="${HERE}/out" export ECLAIR_DATA_DIR="${ECLAIR_OUTPUT_DIR}/.data" export PROJECT_ECD="${ECLAIR_OUTPUT_DIR}/PROJECT.ecd" -rm -rf "$ECLAIR_OUTPUT_DIR" -mkdir -p "$ECLAIR_DATA_DIR" -export ECLAIR_DIAGNOSTICS_OUTPUT="$ECLAIR_OUTPUT_DIR/DIAGNOSTICS.txt" +export JENKINS_XML="${HERE}/jenkins.xml" +rm -rf "${ECLAIR_OUTPUT_DIR}" +mkdir -p "${ECLAIR_DATA_DIR}" +export ECLAIR_DIAGNOSTICS_OUTPUT="${ECLAIR_OUTPUT_DIR}/DIAGNOSTICS.txt" ( cd "@abs_top_builddir@" @@ -57,5 +58,7 @@ fi -- make -j${PROCESSORS} ) -eclair_report "-create_db='$PROJECT_ECD'" "$ECLAIR_DATA_DIR"/FRAME.*.ecb \ +eclair_report "-create_db='${PROJECT_ECD}'" "${ECLAIR_DATA_DIR}"/FRAME.*.ecb \ -load + +eclair_report "-db='${PROJECT_ECD}'" "-reports_jenkins='${JENKINS_XML}'"

1 0