- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Avoid needless macro complexity.
by Abramo Bagnara 14 Mar '12

14 Mar '12

Module: ppl/ppl Branch: master Commit: f3442f48f028d6e94df0246c9ad23d9c43feaf43 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f3442f48f028… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Mar 14 11:34:58 2012 +0100 Avoid needless macro complexity. --- src/Checked_Number.inlines.hh | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index 767b810..ba8b841 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -131,11 +131,6 @@ Checked_Number<T, Policy>::Checked_Number(const type x) { \ dir)); \ } -#define PPL_COND_0(...) -#define PPL_COND_1(...) __VA_ARGS__ -#define PPL_COND_(if, ...) PPL_COND_##if(__VA_ARGS__) -#define PPL_COND(if, ...) PPL_COND_(if, __VA_ARGS__) - PPL_DEFINE_CTOR(char) PPL_DEFINE_CTOR(signed char) PPL_DEFINE_CTOR(signed short) @@ -147,18 +142,20 @@ PPL_DEFINE_CTOR(unsigned short) PPL_DEFINE_CTOR(unsigned int) PPL_DEFINE_CTOR(unsigned long) PPL_DEFINE_CTOR(unsigned long long) -PPL_COND(PPL_SUPPORTED_FLOAT, PPL_DEFINE_CTOR(float)) -PPL_COND(PPL_SUPPORTED_DOUBLE, PPL_DEFINE_CTOR(double)) -PPL_COND(PPL_SUPPORTED_LONG_DOUBLE, PPL_DEFINE_CTOR(long double)) +#if PPL_SUPPORTED_FLOAT +PPL_DEFINE_CTOR(float) +#endif +#if PPL_SUPPORTED_DOUBLE +PPL_DEFINE_CTOR(double) +#endif +#if PPL_SUPPORTED_LONG_DOUBLE +PPL_DEFINE_CTOR(long double) +#endif PPL_DEFINE_CTOR(mpq_class&) PPL_DEFINE_CTOR(mpz_class&) #undef PPL_DEFINE_CTOR -#undef PPL_COND -#undef PPL_COND_ -#undef PPL_COND_1 -#undef PPL_COND_0 template <typename T, typename Policy> inline

1 0

[GIT] ppl/ppl(master): Fixed licenses text.
by Abramo Bagnara 13 Mar '12

13 Mar '12

Module: ppl/ppl Branch: master Commit: cca8637a572ebcf456d4b65268a2947d22e93dd9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cca8637a572e… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Mar 13 18:18:17 2012 +0100 Fixed licenses text. --- README.configure | 2 +- demos/ppl_lpsol/glpk_set_d_eps.c | 1 - .../ppl_interface_generator_java_test_java_code.m4 | 1 + interfaces/Prolog/Prolog_configured_interface.dox | 2 +- interfaces/Prolog/Prolog_interface.dox | 2 +- interfaces/Prolog/Prolog_interface_sysdep.dox | 2 +- interfaces/Prolog/Prolog_interface_sysindep.dox | 2 +- .../Prolog/Prolog_interface_sysindep_domains.dox | 2 +- .../Prolog/ppl_interface_generator_prolog_dox.m4 | 2 +- tests/Concrete_Expression/linearize.cc | 2 +- tests/Grid/Makefile.am | 5 ++--- tests/Partially_Reduced_Product/Makefile.am | 5 ++--- tests/Powerset/Makefile.am | 5 ++--- tests/README | 3 ++- 14 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.configure b/README.configure index f542911..f4f118e 100644 --- a/README.configure +++ b/README.configure @@ -466,7 +466,7 @@ 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 license is included, in various formats, in the `doc' subdirectory of each distribution of the PPL in -files are called `gpl.*'. +files called `gpl.*'. The PPL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/demos/ppl_lpsol/glpk_set_d_eps.c b/demos/ppl_lpsol/glpk_set_d_eps.c index fcf976f..638c8b7 100644 --- a/demos/ppl_lpsol/glpk_set_d_eps.c +++ b/demos/ppl_lpsol/glpk_set_d_eps.c @@ -7,7 +7,6 @@ Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> Copyright (C) 2010-2012 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 diff --git a/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 b/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 index 182ca24..dc71a8f 100644 --- a/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 +++ b/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 @@ -12,6 +12,7 @@ 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 diff --git a/interfaces/Prolog/Prolog_configured_interface.dox b/interfaces/Prolog/Prolog_configured_interface.dox index 79d7bf2..1480f17 100644 --- a/interfaces/Prolog/Prolog_configured_interface.dox +++ b/interfaces/Prolog/Prolog_configured_interface.dox @@ -19,7 +19,7 @@ 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/ppl/ . */ +site: http://bugseng.com/products/ppl/ . */ /*! \defgroup PPL_Prolog_interface Prolog Language Interface diff --git a/interfaces/Prolog/Prolog_interface.dox b/interfaces/Prolog/Prolog_interface.dox index bbf350b..11aeaa4 100644 --- a/interfaces/Prolog/Prolog_interface.dox +++ b/interfaces/Prolog/Prolog_interface.dox @@ -19,7 +19,7 @@ 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/ppl/ . */ +site: http://bugseng.com/products/ppl/ . */ /*! \defgroup PPL_Prolog_interface Prolog Language Interface diff --git a/interfaces/Prolog/Prolog_interface_sysdep.dox b/interfaces/Prolog/Prolog_interface_sysdep.dox index 417088e..2472e0a 100644 --- a/interfaces/Prolog/Prolog_interface_sysdep.dox +++ b/interfaces/Prolog/Prolog_interface_sysdep.dox @@ -19,7 +19,7 @@ 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/ppl/ . */ +site: http://bugseng.com/products/ppl/ . */ /*! \page PI_SD_Features Prolog Interface System-Dependent Features diff --git a/interfaces/Prolog/Prolog_interface_sysindep.dox b/interfaces/Prolog/Prolog_interface_sysindep.dox index f90ef98..9d10d31 100644 --- a/interfaces/Prolog/Prolog_interface_sysindep.dox +++ b/interfaces/Prolog/Prolog_interface_sysindep.dox @@ -19,7 +19,7 @@ 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/ppl/ . */ +site: http://bugseng.com/products/ppl/ . */ /*! \page PI_SI_Features System-Independent Features diff --git a/interfaces/Prolog/Prolog_interface_sysindep_domains.dox b/interfaces/Prolog/Prolog_interface_sysindep_domains.dox index cd85a24..a16eb14 100644 --- a/interfaces/Prolog/Prolog_interface_sysindep_domains.dox +++ b/interfaces/Prolog/Prolog_interface_sysindep_domains.dox @@ -19,7 +19,7 @@ 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/ppl/ . */ +site: http://bugseng.com/products/ppl/ . */ /*! \page domains_predicates Domains Predicates diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_dox.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_dox.m4 index 174d27a..ca7f938 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_dox.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_dox.m4 @@ -23,7 +23,7 @@ dnl along with this program; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. dnl dnl For the most up-to-date information see the Parma Polyhedra Library -dnl site: http://bugseng.com/ppl/ . +dnl site: http://bugseng.com/products/ppl/ . dnl FIXME: This should be in the main m4 generator file. diff --git a/tests/Concrete_Expression/linearize.cc b/tests/Concrete_Expression/linearize.cc index 9d943e1..29dee84 100644 --- a/tests/Concrete_Expression/linearize.cc +++ b/tests/Concrete_Expression/linearize.cc @@ -4,7 +4,7 @@ This file is part of the Parma Polyhedra Library (PPL). -The PPL is free software; you can redistribute it and/or moDif_FP_Expressiony it +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. diff --git a/tests/Grid/Makefile.am b/tests/Grid/Makefile.am index 8fc1ab1..acfb4d5 100644 --- a/tests/Grid/Makefile.am +++ b/tests/Grid/Makefile.am @@ -15,9 +15,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. +# 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/ . diff --git a/tests/Partially_Reduced_Product/Makefile.am b/tests/Partially_Reduced_Product/Makefile.am index 10a14f1..731141b 100644 --- a/tests/Partially_Reduced_Product/Makefile.am +++ b/tests/Partially_Reduced_Product/Makefile.am @@ -15,9 +15,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. +# 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/ . diff --git a/tests/Powerset/Makefile.am b/tests/Powerset/Makefile.am index df6075e..d750ccd 100644 --- a/tests/Powerset/Makefile.am +++ b/tests/Powerset/Makefile.am @@ -15,9 +15,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -# USA. +# 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/ . diff --git a/tests/README b/tests/README index 0870717..1f70cb0 100644 --- a/tests/README +++ b/tests/README @@ -86,6 +86,7 @@ f) Run `mytest' and enjoy! -------- Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> +Copyright (C) 2010-2012 BUGSENG srl (http://bugseng.com) This file is part of the Parma Polyhedra Library (PPL). @@ -101,7 +102,7 @@ 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 license is included, in various formats, in the `doc' subdirectory of each distribution of the PPL in -files are called `gpl.*'. +files called `gpl.*'. The PPL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

1 0

[GIT] ppl/ppl(master): Removed bogus use of EXTRA_DIST.
by Roberto Bagnara 13 Mar '12

13 Mar '12

Module: ppl/ppl Branch: master Commit: abfdcd61e39ddd20bdaaca51b9e3784c0a740db6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=abfdcd61e39d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 13 17:49:43 2012 +0100 Removed bogus use of EXTRA_DIST. --- tests/Concrete_Expression/Makefile.am | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index 54b1af8..428d71d 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -66,7 +66,6 @@ polyhedron2 BUGS = -EXTRA_DIST = $(ALL_TESTS) $(BUGS) # There are platforms where no floating-point type is supported. if SUPPORTED_SOME_FLOATING_POINT_TYPE

1 0

[GIT] ppl/ppl(master): Avoid implicit conversions to bool.
by Enea Zaffanella 12 Mar '12

12 Mar '12

Module: ppl/ppl Branch: master Commit: 15351dec0d694afe3fc73174a5833f009fd26dc4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=15351dec0d69… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 12 13:53:04 2012 +0100 Avoid implicit conversions to bool. Detected by ECLAIR service utypflag. --- demos/ppl_lcdd/ppl_lcdd.cc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 71f22a4..744c696 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -504,7 +504,8 @@ template <typename T> bool guarded_read(std::istream& in, T& x) { try { - return in >> x; + in >> x; + return !in.fail(); } catch (...) { return false; @@ -516,7 +517,8 @@ void guarded_write(std::ostream& out, const T& x) { bool succeeded = false; try { - succeeded = out << x; + out << x; + succeeded = !out.fail(); } catch (...) { } @@ -1161,7 +1163,8 @@ write_polyhedron(std::ostream& out, // Flush `out'. bool flush_succeeded = false; try { - flush_succeeded = out.flush(); + out.flush(); + flush_succeeded = !out.fail(); } catch (...) { }

1 0

[GIT] ppl/ppl(master): Avoid implicit conversion from boolean to integral.
by Enea Zaffanella 12 Mar '12

12 Mar '12

Module: ppl/ppl Branch: master Commit: b623cb806b22deb707f97a29995a26d464f5ba15 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b623cb806b22… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 12 11:39:12 2012 +0100 Avoid implicit conversion from boolean to integral. Detected by ECLAIR service utypflag. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 6 +++--- interfaces/Prolog/SWI/swi_cfli.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 478a36a..387cf2c 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -275,7 +275,7 @@ ppl_@CLASS@_frequency Coefficient& pfreq_d = *to_nonconst(freq_d); Coefficient& pval_n = *to_nonconst(val_n); Coefficient& pval_d = *to_nonconst(val_d); - return pph.frequency(lle, pfreq_n, pfreq_d, pval_n, pval_d); + return pph.frequency(lle, pfreq_n, pfreq_d, pval_n, pval_d) ? 1 : 0; } CATCH_ALL @@ -1237,7 +1237,7 @@ ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ (ppl_const_@CLASS@_t pset) try { const @TOPOLOGY@@CPP_CLASS@& ppset = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset)); - return termination_test_@TERMINATION_ID@(ppset); + return termination_test_@TERMINATION_ID@(ppset) ? 1 : 0; } CATCH_ALL @@ -1252,7 +1252,7 @@ ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_before)); const @TOPOLOGY@@CPP_CLASS@& ppset_after = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_after)); - return termination_test_@TERMINATION_ID@_2(ppset_before, ppset_after); + return termination_test_@TERMINATION_ID@_2(ppset_before, ppset_after) ? 1 : 0; } CATCH_ALL diff --git a/interfaces/Prolog/SWI/swi_cfli.hh b/interfaces/Prolog/SWI/swi_cfli.hh index 9581096..414d1f4 100644 --- a/interfaces/Prolog/SWI/swi_cfli.hh +++ b/interfaces/Prolog/SWI/swi_cfli.hh @@ -294,7 +294,7 @@ Prolog_is_compound(Prolog_term_ref t) { */ inline int Prolog_is_cons(Prolog_term_ref t) { - return !PL_is_atom(t) && PL_is_list(t); + return (!PL_is_atom(t) && PL_is_list(t)) ? 1 : 0; } /*!

1 0

[GIT] ppl/ppl(master): Prefer testing explicitly against zero.
by Enea Zaffanella 12 Mar '12

12 Mar '12

Module: ppl/ppl Branch: master Commit: 5a2bb64fd41b260b6f68e47053c7a94cb84a65ed URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5a2bb64fd41b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 12 11:38:03 2012 +0100 Prefer testing explicitly against zero. Detected by ECLAIR service utypflag. --- src/BDS_Status.inlines.hh | 2 +- src/Og_Status.inlines.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BDS_Status.inlines.hh b/src/BDS_Status.inlines.hh index 28cbbb3..9ba7aed 100644 --- a/src/BDS_Status.inlines.hh +++ b/src/BDS_Status.inlines.hh @@ -47,7 +47,7 @@ BD_Shape<T>::Status::test_all(flags_t mask) const { template <typename T> inline bool BD_Shape<T>::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } template <typename T> diff --git a/src/Og_Status.inlines.hh b/src/Og_Status.inlines.hh index 2f4f2d6..0fa705f 100644 --- a/src/Og_Status.inlines.hh +++ b/src/Og_Status.inlines.hh @@ -47,7 +47,7 @@ Octagonal_Shape<T>::Status::test_all(flags_t mask) const { template <typename T> inline bool Octagonal_Shape<T>::Status::test_any(flags_t mask) const { - return flags & mask; + return (flags & mask) != 0; } template <typename T>

1 0

[GIT] ppl/ppl(master): Use variables instead of repetition.
by Roberto Bagnara 11 Mar '12

11 Mar '12

Module: ppl/ppl Branch: master Commit: 72de66fb850462c62458725dc21e33c4026eaf2c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=72de66fb8504… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 19:47:56 2012 +0100 Use variables instead of repetition. --- doc/Makefile.am | 56 +++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index d82a453..bf167f6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -910,19 +910,19 @@ SED_C_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' SED_C_INPUT_USER = \ +$(DOX_LICENSE_FILES) \ ../interfaces/C/ppl_c_version.h \ $(srcdir)/../interfaces/C/ppl_c_header.h \ -$(srcdir)/../interfaces/C/C_interface.dox \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/C/C_interface.dox SED_C_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ ../interfaces/C/ppl_c_version.h \ $(srcdir)/../interfaces/C/ppl_c_header.h \ $(srcdir)/../interfaces/C/C_interface.dox \ $(srcdir)/../interfaces/C/ppl_c_implementation_common.cc \ $(srcdir)/../interfaces/C/ppl_c_implementation_common.defs.hh \ -$(srcdir)/../interfaces/C/ppl_c_implementation_common.inlines.hh \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/C/ppl_c_implementation_common.inlines.hh user-c-interface.latex-dir: \ user-language-interface.doxyconf \ @@ -991,14 +991,15 @@ SED_PROLOG_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' SED_PROLOG_INPUT_USER = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/Prolog/Prolog_interface.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep_domains.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_compilation.dox \ -$(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox SED_PROLOG_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/Prolog/Prolog_interface.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep_domains.dox \ @@ -1006,8 +1007,7 @@ $(srcdir)/../interfaces/Prolog/Prolog_interface_compilation.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox \ $(srcdir)/../interfaces/Prolog/ppl_prolog_common.defs.hh \ $(srcdir)/../interfaces/Prolog/ppl_prolog_common.inlines.hh \ -$(srcdir)/../interfaces/Prolog/ppl_prolog_common.cc \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/Prolog/ppl_prolog_common.cc user-prolog-interface.latex-dir: \ user-language-interface.doxyconf \ @@ -1076,15 +1076,15 @@ SED_OCAML_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>/\\usepackage{ocamldoc}/' SED_OCAML_INPUT_USER = \ -$(srcdir)/../interfaces/OCaml/OCaml_interface.dox \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(DOX_LICENSE_FILES) \ +$(srcdir)/../interfaces/OCaml/OCaml_interface.dox SED_OCAML_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/OCaml/OCaml_interface.dox \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.cc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.defs.hh \ -$(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh OCAMLDOC_HTML_OPTIONS = \ -I @mlgmp_dir@ -I $(top_builddir)/interfaces/OCaml -html @@ -1170,16 +1170,16 @@ SED_JAVA_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' SED_JAVA_INPUT_USER = \ -$(srcdir)/../interfaces/Java/parma_polyhedra_library \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(DOX_LICENSE_FILES) \ +$(srcdir)/../interfaces/Java/parma_polyhedra_library SED_JAVA_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/Java/parma_polyhedra_library \ $(srcdir)/../interfaces/Java/jni/ppl_java_common.cc \ $(srcdir)/../interfaces/Java/jni/ppl_java_common.defs.hh \ $(srcdir)/../interfaces/Java/jni/ppl_java_common.inlines.hh \ -$(srcdir)/../interfaces/Java/jni/ppl_java_globals.cc \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/Java/jni/ppl_java_globals.cc user-java-interface.latex-dir: \ user-language-interface.doxyconf \ @@ -1253,17 +1253,17 @@ SED_CONFIGURED_C_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' SED_CONFIGURED_C_INPUT_USER = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/C/C_interface.dox \ -../interfaces/C/ppl_c.h \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +../interfaces/C/ppl_c.h SED_CONFIGURED_C_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/C/C_interface.dox \ ../interfaces/C/ppl_c.h \ $(srcdir)/../interfaces/C/ppl_c_implementation_common.cc \ $(srcdir)/../interfaces/C/ppl_c_implementation_common.defs.hh \ -$(srcdir)/../interfaces/C/ppl_c_implementation_common.inlines.hh \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/C/ppl_c_implementation_common.inlines.hh # FIXME add generated files user-configured-c-interface.latex-dir: \ @@ -1338,14 +1338,15 @@ SED_CONFIGURED_PROLOG_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>//' SED_CONFIGURED_PROLOG_INPUT_USER = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/Prolog/Prolog_configured_interface.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep.dox \ ../interfaces/Prolog/Prolog_configured_domains.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_compilation.dox \ -$(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox SED_CONFIGURED_PROLOG_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/Prolog/Prolog_configured_interface.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysindep.dox \ ../interfaces/Prolog/Prolog_configured_domains.dox \ @@ -1353,8 +1354,7 @@ $(srcdir)/../interfaces/Prolog/Prolog_interface_compilation.dox \ $(srcdir)/../interfaces/Prolog/Prolog_interface_sysdep.dox \ $(srcdir)/../interfaces/Prolog/ppl_prolog_common.defs.hh \ $(srcdir)/../interfaces/Prolog/ppl_prolog_common.inlines.hh \ -$(srcdir)/../interfaces/Prolog/ppl_prolog_common.cc \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/Prolog/ppl_prolog_common.cc # FIXME: add appropriate generated files. user-configured-prolog-interface.latex-dir: \ @@ -1429,15 +1429,15 @@ SED_CONFIGURED_OCAML_OPTION = \ -e 's/<PPL_SED_USEPACKAGE_OCAMLDOC>/\\usepackage{ocamldoc}/' SED_CONFIGURED_OCAML_INPUT_USER = \ -$(srcdir)/../interfaces/OCaml/OCaml_interface.dox \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(DOX_LICENSE_FILES) \ +$(srcdir)/../interfaces/OCaml/OCaml_interface.dox SED_CONFIGURED_OCAML_INPUT_DEVREF = \ +$(DOX_LICENSE_FILES) \ $(srcdir)/../interfaces/OCaml/OCaml_interface.dox \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.cc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_common.defs.hh \ -$(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh \ -$(srcdir)/gpl.dox $(srcdir)/fdl.dox +$(srcdir)/../interfaces/OCaml/ppl_ocaml_common.inlines.hh user-configured-ocaml-interface.latex-dir: \ user-language-interface.doxyconf \

1 0

[GIT] ppl/ppl(master): Typo fixed.
by Roberto Bagnara 11 Mar '12

11 Mar '12

Module: ppl/ppl Branch: master Commit: 68acb101eab3f4adfa2bfc6612088ec918c20478 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68acb101eab3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 19:41:31 2012 +0100 Typo fixed. --- doc/Makefile.am | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index b91e040..d82a453 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,12 +62,12 @@ DEVREF_CORE_PS_MANUAL = ppl-devref-@VERSION@.ps.gz USER_CORE_HTML_DIR = ppl-user-@VERSION@-html DEVREF_CORE_HTML_DIR = ppl-devref-@VERSION@-html -DOX_LICENCE_FILES = \ +DOX_LICENSE_FILES = \ gpl.dox \ fdl.dox DOX_FILES = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ definitions.dox USER_CORE_STUFF = \ @@ -108,7 +108,7 @@ DEVREF_C_INTERFACE_HTML_DIR = \ ppl-devref-c-interface-@VERSION@-html COMMON_C_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ ppl.sty \ ../configure.ac \ ../interfaces/C/ppl_c_version.h.in \ @@ -195,14 +195,14 @@ PROLOG_INTERFACE_ADDITIONAL_DOX_PAGES = \ ../interfaces/Prolog/Prolog_interface_sysdep.dox USER_PROLOG_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ user-language-interface.tex \ ppl.sty \ ../interfaces/Prolog/Prolog_interface.dox \ $(PROLOG_INTERFACE_ADDITIONAL_DOX_PAGES) DEVREF_PROLOG_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ devref-language-interface.tex \ ppl.sty \ ../interfaces/Prolog/Prolog_interface.dox \ @@ -235,14 +235,14 @@ DEVREF_CONFIGURED_PROLOG_INTERFACE_HTML_DIR = \ ppl-devref-configured-prolog-interface-@VERSION@-html USER_CONFIGURED_PROLOG_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ user-language-interface.tex \ ppl.sty \ ../interfaces/Prolog/Prolog_configured_interface.dox \ $(PROLOG_INTERFACE_ADDITIONAL_DOX_PAGES) DEVREF_CONFIGURED_PROLOG_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ devref-language-interface.tex \ ppl.sty \ ../interfaces/Prolog/Prolog_configured_interface.dox \ @@ -281,14 +281,14 @@ DEVREF_OCAML_INTERFACE_HTML_DIR = \ ppl-devref-ocaml-interface-@VERSION@-html USER_OCAML_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ user-language-interface.tex \ ppl.sty \ ../interfaces/OCaml/OCaml_interface.dox \ ../interfaces/OCaml/ppl_ocaml_globals.mli DEVREF_OCAML_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ devref-language-interface.tex \ ppl.sty \ ../interfaces/OCaml/OCaml_interface.dox \ @@ -398,13 +398,13 @@ JAVA_INTERFACE_JAVA_FILES = \ ../interfaces/Java/parma_polyhedra_library/Variables_Set.java USER_JAVA_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ user-language-interface.tex \ ppl.sty \ $(JAVA_INTERFACE_JAVA_FILES) DEVREF_JAVA_INTERFACE_STUFF = \ -$(DOX_LICENCE_FILES) \ +$(DOX_LICENSE_FILES) \ devref-language-interface.tex \ ppl.sty \ $(JAVA_INTERFACE_JAVA_FILES) \

1 0

[GIT] ppl/ppl(master): Typos fixed.
by Roberto Bagnara 11 Mar '12

11 Mar '12

Module: ppl/ppl Branch: master Commit: 1a2efa7ce4e67c1fe02325d30bbf7b4eb30e19b9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1a2efa7ce4e6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 18:27:30 2012 +0100 Typos fixed. --- interfaces/Prolog/Prolog_interface_sysindep.dox | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/Prolog_interface_sysindep.dox b/interfaces/Prolog/Prolog_interface_sysindep.dox index aae70c3..f90ef98 100644 --- a/interfaces/Prolog/Prolog_interface_sysindep.dox +++ b/interfaces/Prolog/Prolog_interface_sysindep.dox @@ -276,7 +276,7 @@ The specification uses the following grammar rules: Complexity --> polynomial | simplex | any - Vars_Pair --> PPLVar - PPLVar map relation + Vars_Pair --> PPL_Var - PPL_Var map relation P_Func --> [] list of map relations | [Vars_Pair | P_Func].

1 0

[GIT] ppl/ppl(master): Predicates renamed.
by Roberto Bagnara 11 Mar '12

11 Mar '12

Module: ppl/ppl Branch: master Commit: 9390420242973cd81d3b1f890b464327cec2af86 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=939042024297… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 18:24:50 2012 +0100 Predicates renamed. --- interfaces/Prolog/tests/clpq2.pl | 56 +++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/interfaces/Prolog/tests/clpq2.pl b/interfaces/Prolog/tests/clpq2.pl index be22bdb..bdc3e13 100644 --- a/interfaces/Prolog/tests/clpq2.pl +++ b/interfaces/Prolog/tests/clpq2.pl @@ -54,7 +54,7 @@ solve_query(Goals, VN, Polys_Out) :- % Now find and sort all the PPL dimensions for variables % that occur in bindings to external variables. - terms2wanted_dims(VN, [], Num_List), + terms_to_wanted_dims(VN, [], Num_List), sort(Num_List, Sorted_Num_List), % We want to remove (project away) all other dimensions. @@ -117,13 +117,13 @@ solve(_, { Constraints }, [Poly|Polys], [Poly|Polys]) :- ppl_Polyhedron_space_dimension(Poly, Dims), % Change any free variables into PPL variables. - term2PPLterm(Constraints, Dims, New_Dims), + term_to_PPL_term(Constraints, Dims, New_Dims), Added_Dims is New_Dims - Dims, ppl_Polyhedron_add_space_dimensions_and_embed(Poly, Added_Dims), % Make the sequence of constraints into a list % and check we do have constraints. - constraints2list(Constraints, Constraints_List), + constraints_to_list(Constraints, Constraints_List), ppl_Polyhedron_add_constraints(Poly, Constraints_List), @@ -165,7 +165,7 @@ solve(Topology, Atom, [Poly|Polys], Polys_Out) :- parameter_passing(Atom, Head, Binding_Constraints), % Change any free variables into PPL variables. - terms2PPLterms(Binding_Constraints, Dims, New_Dims), + terms_to_PPL_terms(Binding_Constraints, Dims, New_Dims), Added_Dims is New_Dims - Dims, ppl_Polyhedron_add_space_dimensions_and_embed(Poly_Copy, Added_Dims), @@ -177,7 +177,7 @@ solve(Topology, Atom, [Poly|Polys], Polys_Out) :- % Now remove any dimensions that are higher than % previously and higher than any PPL variables in the atom. - term2wanted_dims(Atom, [], Num_List), + term_to_wanted_dims(Atom, [], Num_List), Max_Wanted1 is Dims - 1, max(Num_List, Max_Wanted1, Max_Wanted), Un_Wanted is Max_Wanted + 1, @@ -659,54 +659,54 @@ int_expr_aux(I-J) :- %%%%%%%%%%%%%%%%%%%%%%%%%% Utility Predicates %%%%%%%%%%%%%%%%%%%%%%%%%% -% term2wanted_dims(?Term, -List_of_Integers) +% term_to_wanted_dims(?Term, -List_of_Integers) % % Takes a term and returns list of numbers in the PPL variables % of the form '$VAR'(k). -term2wanted_dims(V, Ns, Ns) :- +term_to_wanted_dims(V, Ns, Ns) :- var(V), !. -term2wanted_dims('$VAR'(N), Ns, [N|Ns]) :- +term_to_wanted_dims('$VAR'(N), Ns, [N|Ns]) :- !. -term2wanted_dims(Term, Ns_In, Ns_Out) :- +term_to_wanted_dims(Term, Ns_In, Ns_Out) :- Term =.. [_F|Args], - terms2wanted_dims(Args, Ns_In, Ns_Out). + terms_to_wanted_dims(Args, Ns_In, Ns_Out). -terms2wanted_dims([], Ns, Ns). -terms2wanted_dims([Arg|Args], Ns_In, Ns_Out) :- - term2wanted_dims(Arg, Ns_In, Ns1), - terms2wanted_dims(Args, Ns1, Ns_Out). +terms_to_wanted_dims([], Ns, Ns). +terms_to_wanted_dims([Arg|Args], Ns_In, Ns_Out) :- + term_to_wanted_dims(Arg, Ns_In, Ns1), + terms_to_wanted_dims(Args, Ns1, Ns_Out). -constraints2list(C, LC) :- - constraints2list(C, [], LC). +constraints_to_list(C, LC) :- + constraints_to_list(C, [], LC). -constraints2list((A, B), Rest, LC) :- +constraints_to_list((A, B), Rest, LC) :- !, - constraints2list(B, Rest, BRest), - constraints2list(A, BRest, LC). -constraints2list(C, Rest, Rest1) :- + constraints_to_list(B, Rest, BRest), + constraints_to_list(A, BRest, LC). +constraints_to_list(C, Rest, Rest1) :- (check_constraint(C) -> Rest1 = [C|Rest] ; Rest1 = [0 = 1] ). -% term2PPLterm(?Term, +In_N, ?Out_N) +% term_to_PPL_term(?Term, +In_N, ?Out_N) % % Unifies each of the variables in Term with the special terms % '$VAR'(k), where k ranges from In_N to Out_N-1. -term2PPLterm('$VAR'(In_N), In_N, Out_N) :- +term_to_PPL_term('$VAR'(In_N), In_N, Out_N) :- !, Out_N is In_N + 1. -term2PPLterm(Term, In_N, Out_N) :- +term_to_PPL_term(Term, In_N, Out_N) :- Term =.. [_|Args], - terms2PPLterms(Args, In_N, Out_N). + terms_to_PPL_terms(Args, In_N, Out_N). -terms2PPLterms([], In_N, In_N). -terms2PPLterms([Arg|Args], In_N, Out_N) :- - term2PPLterm(Arg, In_N, Tmp_N), - terms2PPLterms(Args, Tmp_N, Out_N). +terms_to_PPL_terms([], In_N, In_N). +terms_to_PPL_terms([Arg|Args], In_N, Out_N) :- + term_to_PPL_term(Arg, In_N, Tmp_N), + terms_to_PPL_terms(Args, Tmp_N, Out_N). build_equality_constraints([], []). build_equality_constraints([Var = Num|Eqs], All_Eq_Constrs) :-

1 0