March 2012 - PPL-devel - BUGSENG Mailman

[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

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

11 Mar '12

Module: ppl/ppl Branch: master Commit: 3fa2a003ff7babd4bfd668443d1f929ef60aaabc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3fa2a003ff7b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 18:20:42 2012 +0100 Identifier fixed. --- src/fpu-c99.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/fpu-c99.inlines.hh b/src/fpu-c99.inlines.hh index 6b1b061..176affd 100644 --- a/src/fpu-c99.inlines.hh +++ b/src/fpu-c99.inlines.hh @@ -38,7 +38,7 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_FPU_DOWNWARD FE_DOWNWARD #endif #ifdef FE_TOWARDZERO -#define PPL_PPL_FPU_TOWARDZERO FE_TOWARDZERO +#define PPL_FPU_TOWARDZERO FE_TOWARDZERO #endif namespace Parma_Polyhedra_Library {

1 0

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

11 Mar '12

Module: ppl/ppl Branch: master Commit: c42d3a7aeede91a6afe160f4f71c61f739d883c1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c42d3a7aeede… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 18:18:30 2012 +0100 String fixed. --- tests/Polyhedron/generalizedaffineimage2.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Polyhedron/generalizedaffineimage2.cc b/tests/Polyhedron/generalizedaffineimage2.cc index 730e716..1f04d5f 100644 --- a/tests/Polyhedron/generalizedaffineimage2.cc +++ b/tests/Polyhedron/generalizedaffineimage2.cc @@ -240,7 +240,7 @@ test08() { print_constraints(ph, "*** after ph.generalized_affine_image" "(B, GREATER_THAN, A + B + 1) ***"); print_generators(ph, "*** after ph.generalized_affine_image" - "(B, PPLGT, A + B + 1) ***"); + "(B, GREATER_THAN, A + B + 1) ***"); return ok; }

1 0

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

11 Mar '12

Module: ppl/ppl Branch: master Commit: ec19e1b522088e842b90896794eb5f1f68997511 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ec19e1b52208… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 11 17:21:42 2012 +0100 Comments simplified. --- src/Generator.defs.hh | 8 ++++---- src/Grid_Generator.defs.hh | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Generator.defs.hh b/src/Generator.defs.hh index 986de03..81de064 100644 --- a/src/Generator.defs.hh +++ b/src/Generator.defs.hh @@ -470,16 +470,16 @@ private: namespace Parma_Polyhedra_Library { -//! Shorthand for Generator Generator::line(const Linear_Expression& e). +//! Shorthand for Generator::line(const Linear_Expression& e). /*! \relates Generator */ Generator line(const Linear_Expression& e); -//! Shorthand for Generator Generator::ray(const Linear_Expression& e). +//! Shorthand for Generator::ray(const Linear_Expression& e). /*! \relates Generator */ Generator ray(const Linear_Expression& e); /*! \brief - Shorthand for Generator + Shorthand for Generator::point(const Linear_Expression& e, Coefficient_traits::const_reference d). \relates Generator @@ -489,7 +489,7 @@ point(const Linear_Expression& e = Linear_Expression::zero(), Coefficient_traits::const_reference d = Coefficient_one()); /*! \brief - Shorthand for Generator + Shorthand for Generator::closure_point(const Linear_Expression& e, Coefficient_traits::const_reference d). \relates Generator diff --git a/src/Grid_Generator.defs.hh b/src/Grid_Generator.defs.hh index f6cc4bc..9642399 100644 --- a/src/Grid_Generator.defs.hh +++ b/src/Grid_Generator.defs.hh @@ -481,14 +481,14 @@ private: namespace Parma_Polyhedra_Library { /*! \brief - Shorthand for Grid_Generator + Shorthand for Grid_Generator::grid_line(const Linear_Expression& e). */ /*! \relates Grid_Generator */ Grid_Generator grid_line(const Linear_Expression& e); /*! \brief - Shorthand for Grid_Generator + Shorthand for Grid_Generator::parameter(const Linear_Expression& e, Coefficient_traits::const_reference d). */ @@ -498,8 +498,7 @@ parameter(const Linear_Expression& e = Linear_Expression::zero(), Coefficient_traits::const_reference d = Coefficient_one()); /*! \brief - Shorthand for Grid_Generator - Grid_Generator::grid_point(const Linear_Expression& e, + Shorthand for Grid_Generator::grid_point(const Linear_Expression& e, Coefficient_traits::const_reference d). */ /*! \relates Grid_Generator */

1 0