- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Scope of declaration reduced.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 1b911f90de35ceeeae99a184b2c1a1756c4d441c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b911f90de35… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:47:40 2014 +0100 Scope of declaration reduced. Fixes a violation of rule CP1.DCL07 detected by ECLAIR. --- demos/ppl_lcdd/ppl_lcdd.cc | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index d4465b6..5506e1c 100755 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -158,30 +158,35 @@ struct option long_options[] = { }; #endif -static const char* usage_string -= "Usage: %s [OPTION]... [FILE]\n" -"Reads an H-representation (resp., a V-representation) of a polyhedron\n" -"and generates a V-representation (resp., an H-representation) of\n" -"the same polyhedron.\n\n" -"Options:\n" +void +usage(const char* program) { + static const char* usage_string + = "Usage: %s [OPTION]... [FILE]\n" + "Reads an H-representation (resp., a V-representation) of a polyhedron\n" + "and generates a V-representation (resp., an H-representation) of\n" + "the same polyhedron.\n\n" + "Options:\n" #ifdef PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME -" -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" + " -CSECS, --max-cpu=SECS limits CPU usage to SECS seconds\n" #endif // defined(PPL_LCDD_SUPPORTS_LIMIT_ON_CPU_TIME) -" -RMB, --max-memory=MB limits memory usage to MB megabytes\n" -" -h, --help prints this help text to stdout\n" -" -oPATH, --output=PATH appends output to PATH\n" -" -t, --timings prints timings to stderr\n" -" -v, --verbose produces lots of output\n" + " -RMB, --max-memory=MB limits memory usage to MB megabytes\n" + " -h, --help prints this help text to stdout\n" + " -oPATH, --output=PATH appends output to PATH\n" + " -t, --timings prints timings to stderr\n" + " -v, --verbose produces lots of output\n" #if defined(USE_PPL) -" -V, --version prints version information to stdout\n" -" -cPATH, --check=PATH checks if the result is equal to what is in PATH\n" + " -V, --version prints version information to stdout\n" + " -cPATH, --check=PATH checks if result is equal to what is in PATH\n" #endif #ifndef PPL_HAVE_GETOPT_H -"\n" -"NOTE: this version does not support long options.\n" + "\n" + "NOTE: this version does not support long options.\n" #endif -"\n" -"Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; + "\n" + "Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; + + fprintf(stdout, usage_string, program); +} #if defined(USE_PPL) #define OPTION_LETTERS "C:R:ho:tvVc:" @@ -402,7 +407,7 @@ process_options(int argc, char* argv[]) { case '?': case 'h': - fprintf(stdout, usage_string, argv[0]); + usage(argv[0]); exit(0); break;

1 0

[GIT] ppl/ppl(master): Parenthesis spacing corrected.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: c1b9cd4b8b15570cb79f6ddf65146d0b2b53bfaa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c1b9cd4b8b15… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 15:38:16 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/BD_Shape_defs.hh | 69 ++++++++++++++++++++------------------ src/Box_defs.hh | 9 +++-- src/Octagonal_Shape_defs.hh | 30 ++++++++++------ src/Pointset_Powerset_inlines.hh | 10 ++--- src/Polyhedron_templates.hh | 8 ++-- 5 files changed, 67 insertions(+), 59 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c1b9cd4b…

1 0

[GIT] ppl/ppl(master): Parenthesis spacing corrected.
by Roberto Bagnara 14 Dec '14

14 Dec '14

Module: ppl/ppl Branch: master Commit: 1b0c99aec7406a06ac151eaeaf336c17d57c9cfc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b0c99aec740… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 14 10:40:35 2014 +0100 Parenthesis spacing corrected. Fixes violations of rule UCGP1.M1 detected by ECLAIR. --- src/Checked_Number_inlines.hh | 43 ++++++++++++++---------------- src/Float_templates.hh | 2 +- src/Grid_public.cc | 17 ++++++++--- src/Linear_Expression_defs.hh | 41 +++++++++++++++++------------ src/Linear_Expression_inlines.hh | 44 +++++++++++++++++-------------- src/Polyhedron_conversion_templates.hh | 2 +- src/compiler.hh | 2 +- src/intervals_defs.hh | 4 +- 8 files changed, 85 insertions(+), 70 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1b0c99ae…

1 0

[GIT] ppl/ppl(master): Post-decrement avoided.
by Roberto Bagnara 09 Dec '14

09 Dec '14

Module: ppl/ppl Branch: master Commit: 4fc56de4298c819b8b157c04e6b85a95830e9470 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4fc56de4298c… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 9 22:49:29 2014 +0100 Post-decrement avoided. Fixes a violation of rule UCGP1.M2 detected by ECLAIR. --- src/Polyhedron_nonpublic.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index 778e46d..e8eec52 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -2428,7 +2428,7 @@ PPL::Polyhedron::positive_time_elapse_assign_impl(const Polyhedron& y) { Generator &g = new_gs.sys.rows[i]; if (g.is_point()) { x_points_gs.insert(g); - num_rows--; + --num_rows; swap(g, new_gs.sys.rows[num_rows]); } }

1 0

[GIT] ppl/ppl(master): Capitalization and punctuation fixed.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: 1965308c8331fc0941d3fdb3db748115989ec548 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1965308c8331… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Nov 30 00:03:48 2014 +0100 Capitalization and punctuation fixed. --- src/Handler_defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Handler_defs.hh b/src/Handler_defs.hh index 3a83b33..d410ea4 100644 --- a/src/Handler_defs.hh +++ b/src/Handler_defs.hh @@ -71,7 +71,7 @@ public: virtual void act() const; private: - // declare holder as reference to volatile pointer to const Flag_Base + // Declare holder as reference to volatile pointer to const Flag_Base. const Flag_Base* volatile& h; Flag& f; };

1 0

[GIT] ppl/ppl(master): Shadowing avoided. Naming improved.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: b289e921c5e93c2a65424bdf916725bf9a85a36e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b289e921c5e9… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Nov 29 23:59:01 2014 +0100 Shadowing avoided. Naming improved. --- src/Dense_Row_defs.hh | 8 ++-- src/Dense_Row_inlines.hh | 56 +++++++++++++++--------------- src/Expression_Adapter_defs.hh | 8 ++-- src/Expression_Adapter_inlines.hh | 8 ++-- src/Expression_Hide_Inhomo_defs.hh | 8 ++-- src/Expression_Hide_Inhomo_inlines.hh | 12 +++--- src/Expression_Hide_Last_defs.hh | 8 ++-- src/Expression_Hide_Last_inlines.hh | 16 ++++---- src/Linear_Expression_Impl_defs.hh | 22 ++++++------ src/Linear_Expression_Impl_templates.hh | 12 +++--- src/Linear_Expression_Interface_defs.hh | 22 ++++++------ src/Linear_Expression_defs.hh | 2 +- src/Sparse_Row.cc | 24 +++++++------- 13 files changed, 103 insertions(+), 103 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b289e921…

1 0

[GIT] ppl/ppl(master): Disable some warnings.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: 5779b82ff518f3a0ce61ade40418e4745015460d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5779b82ff518… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Nov 29 21:20:59 2014 +0100 Disable some warnings. --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 890d386..d839a38 100644 --- a/configure.ac +++ b/configure.ac @@ -1607,7 +1607,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" + 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" else CFLAGS="$CFLAGS -W -Wall" fi @@ -1619,7 +1619,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" + 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" else CXXFLAGS="$CXXFLAGS -W -Wall" fi

1 0

[GIT] ppl/ppl(master): Shadowing avoided. Comments improved.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: 7e35231d886889650dda6f14c7eb25fb9679694a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7e35231d8868… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Nov 29 21:00:04 2014 +0100 Shadowing avoided. Comments improved. --- src/Linear_Expression_defs.hh | 45 ++++++++++++++++++++----------------- src/Linear_Expression_inlines.hh | 38 ++++++++++++++++---------------- src/MIP_Problem_defs.hh | 3 +- src/MIP_Problem_inlines.hh | 4 +- 4 files changed, 47 insertions(+), 43 deletions(-) diff --git a/src/Linear_Expression_defs.hh b/src/Linear_Expression_defs.hh index af0284c..8892d1b 100644 --- a/src/Linear_Expression_defs.hh +++ b/src/Linear_Expression_defs.hh @@ -402,32 +402,32 @@ public: //! The copy constructor. /*! - \param itr + \param i The %iterator that will be copied. This constructor takes \f$O(1)\f$ time. */ - const_iterator(const const_iterator& itr); + const_iterator(const const_iterator& i); ~const_iterator(); - //! Swaps itr with *this. + //! Swaps \p i with \p *this. /*! - \param itr - The %iterator that will be swapped with *this. + \param i + The %iterator that will be swapped with \p *this. This method takes \f$O(1)\f$ time. */ - void m_swap(const_iterator& itr); + void m_swap(const_iterator& i); - //! Assigns \p itr to *this . + //! Assigns \p i to *this . /*! - \param itr + \param i The %iterator that will be assigned into *this. This method takes \f$O(1)\f$ time. */ - const_iterator& operator=(const const_iterator& itr); + const_iterator& operator=(const const_iterator& i); //! Navigates to the next nonzero coefficient. /*! @@ -452,24 +452,24 @@ public: */ Variable variable() const; - //! Compares \p *this with x . + //! Compares \p *this with \p i. /*! - \param x + \param i The %iterator that will be compared with *this. */ - bool operator==(const const_iterator& x) const; + bool operator==(const const_iterator& i) const; - //! Compares \p *this with x . + //! Compares \p *this with \p i . /*! \param x The %iterator that will be compared with *this. */ - bool operator!=(const const_iterator& x) const; + bool operator!=(const const_iterator& i) const; private: //! Constructor from a const_iterator_interface*. //! The new object takes ownership of the dynamic object. - const_iterator(Linear_Expression_Interface::const_iterator_interface* itr); + const_iterator(Linear_Expression_Interface::const_iterator_interface* i); Linear_Expression_Interface::const_iterator_interface* itr; @@ -784,14 +784,17 @@ private: Coefficient_traits::const_reference c2, dimension_type start, dimension_type end) const; - //! Sets `row' to a copy of the row that implements *this. - void get_row(Dense_Row& row) const; + //! Sets \p row to a copy of the row that implements \p *this. + void get_row(Dense_Row& r) const; - //! Sets `row' to a copy of the row that implements *this. - void get_row(Sparse_Row& row) const; + //! Sets \p r to a copy of the row that implements \p *this. + void get_row(Sparse_Row& r) const; - //! Returns true if there is a variable in [first,last) whose coefficient - //! is nonzero in both *this and x. + /*! \brief + Returns \p true if there is a variable from index \p first (included) + to index \p last (excluded) whose coefficient is nonzero in both + \p *this and \p x. + */ bool have_a_common_variable(const Linear_Expression& x, Variable first, Variable last) const; diff --git a/src/Linear_Expression_inlines.hh b/src/Linear_Expression_inlines.hh index d2f120c..9f6c5c1 100644 --- a/src/Linear_Expression_inlines.hh +++ b/src/Linear_Expression_inlines.hh @@ -551,14 +551,14 @@ Linear_Expression inline void Linear_Expression -::get_row(Dense_Row& row) const { - return impl->get_row(row); +::get_row(Dense_Row& r) const { + return impl->get_row(r); } inline void Linear_Expression -::get_row(Sparse_Row& row) const { - return impl->get_row(row); +::get_row(Sparse_Row& r) const { + return impl->get_row(r); } inline void @@ -626,27 +626,27 @@ Linear_Expression::const_iterator inline Linear_Expression::const_iterator -::const_iterator(const const_iterator& x) - : itr(x.itr->clone()) { +::const_iterator(const const_iterator& i) + : itr(i.itr->clone()) { } inline Linear_Expression::const_iterator ::~const_iterator() { - // Note that this does nothing if itr==NULL. + // Note that this does nothing if itr == NULL. delete itr; } inline void -Linear_Expression::const_iterator::m_swap(const_iterator& x) { +Linear_Expression::const_iterator::m_swap(const_iterator& i) { using std::swap; - swap(itr, x.itr); + swap(itr, i.itr); } inline Linear_Expression::const_iterator& Linear_Expression::const_iterator -::operator=(const const_iterator& itr) { - const_iterator tmp = itr; +::operator=(const const_iterator& i) { + const_iterator tmp = i; using std::swap; swap(*this, tmp); return *this; @@ -684,23 +684,23 @@ Linear_Expression::const_iterator inline bool Linear_Expression::const_iterator -::operator==(const const_iterator& x) const { +::operator==(const const_iterator& i) const { PPL_ASSERT(itr != NULL); - PPL_ASSERT(x.itr != NULL); - return *itr == *(x.itr); + PPL_ASSERT(i.itr != NULL); + return *itr == *(i.itr); } inline bool Linear_Expression::const_iterator -::operator!=(const const_iterator& x) const { - return !(*this == x); +::operator!=(const const_iterator& i) const { + return !(*this == i); } inline Linear_Expression::const_iterator -::const_iterator(Linear_Expression_Interface::const_iterator_interface* itr) - : itr(itr) { - PPL_ASSERT(itr != NULL); +::const_iterator(Linear_Expression_Interface::const_iterator_interface* i) + : itr(i) { + PPL_ASSERT(i != NULL); } inline Linear_Expression::const_iterator diff --git a/src/MIP_Problem_defs.hh b/src/MIP_Problem_defs.hh index a30173e..faa9ec4 100644 --- a/src/MIP_Problem_defs.hh +++ b/src/MIP_Problem_defs.hh @@ -242,6 +242,7 @@ public: private: typedef Constraint_Sequence::const_iterator Base; typedef std::iterator_traits<Base> Base_Traits; + public: typedef Base_Traits::iterator_category iterator_category; typedef Base_Traits::difference_type difference_type; @@ -298,7 +299,7 @@ public: private: //! Constructor from a Base iterator. - explicit const_iterator(Base base); + explicit const_iterator(Base b); //! The Base iterator on the Constraint_Sequence. Base itr; diff --git a/src/MIP_Problem_inlines.hh b/src/MIP_Problem_inlines.hh index d415351..8fafceb 100644 --- a/src/MIP_Problem_inlines.hh +++ b/src/MIP_Problem_inlines.hh @@ -238,8 +238,8 @@ MIP_Problem::total_memory_in_bytes() const { } inline -MIP_Problem::const_iterator::const_iterator(Base base) - : itr(base) { +MIP_Problem::const_iterator::const_iterator(Base b) + : itr(b) { } inline MIP_Problem::const_iterator::difference_type

1 0

[GIT] ppl/ppl(master): Spurious comma removed.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: 68b7da3bae7bf2c2670444e6a6d8a8ea54318dc1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68b7da3bae7b… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Nov 29 20:12:05 2014 +0100 Spurious comma removed. --- src/Boundary_defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Boundary_defs.hh b/src/Boundary_defs.hh index 420beb1..efced41 100644 --- a/src/Boundary_defs.hh +++ b/src/Boundary_defs.hh @@ -33,7 +33,7 @@ namespace Boundary_NS { struct Property { enum Type { SPECIAL_, - OPEN_, + OPEN_ }; typedef bool Value; static const Value default_value = true;

1 0

[GIT] ppl/ppl(master): Added missing header file and inclusions.
by Roberto Bagnara 29 Nov '14

29 Nov '14

Module: ppl/ppl Branch: master Commit: 3a30bffb1c73c16dcc2e1bf96527a8749dac4f45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a30bffb1c73… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sat Nov 29 20:07:49 2014 +0100 Added missing header file and inclusions. --- interfaces/Prolog/SWI/Makefile.am | 1 + interfaces/Prolog/SWI/pl_clpq.cc | 10 +++----- .../SWI/ppl_interface_generator_swiprolog_cc.m4 | 7 +++-- interfaces/Prolog/SWI/ppl_pl.cc | 10 +++----- interfaces/Prolog/SWI/ppl_swiprolog.hh | 22 ++++++++++++++++++++ 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 529aa5c..9a33098 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -74,6 +74,7 @@ pkglib_LTLIBRARIES = libppl_swiprolog.la libppl_swiprolog_la_SOURCES = \ ppl_prolog_sysdep.hh \ +ppl_swiprolog.hh \ swi_efli.hh \ swi_efli.cc diff --git a/interfaces/Prolog/SWI/pl_clpq.cc b/interfaces/Prolog/SWI/pl_clpq.cc index a287134..ebdd698 100644 --- a/interfaces/Prolog/SWI/pl_clpq.cc +++ b/interfaces/Prolog/SWI/pl_clpq.cc @@ -21,10 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <SWI-Prolog.h> - -extern "C" install_t install(); -extern "C" install_t uninstall(); +#include "ppl_swiprolog.hh" +#include "swi_cfli.hh" int main(int, char** argv) { @@ -39,10 +37,10 @@ main(int, char** argv) { if (!PL_initialise(1, pl_args)) PL_halt(1); - install(); + install_libppl_swiprolog(); predicate_t pred = PL_predicate("main", 0, "user"); term_t h0 = PL_new_term_refs(0); int ret_val = PL_call_predicate(0, PL_Q_NORMAL, pred, h0); - uninstall(); + uninstall_libppl_swiprolog(); PL_halt(ret_val ? 0 : 1); } diff --git a/interfaces/Prolog/SWI/ppl_interface_generator_swiprolog_cc.m4 b/interfaces/Prolog/SWI/ppl_interface_generator_swiprolog_cc.m4 index 5680f65..b108b7b 100644 --- a/interfaces/Prolog/SWI/ppl_interface_generator_swiprolog_cc.m4 +++ b/interfaces/Prolog/SWI/ppl_interface_generator_swiprolog_cc.m4 @@ -32,9 +32,10 @@ m4_include(`ppl_interface_generator_copyright')`'dnl */ #include "../ppl_prolog_domains.hh" +#include "ppl_swiprolog.hh" #define PL_EXTENSION_ENTRY(name, arity) \ - { #name, arity, static_cast<pl_function_t>(name), 0 }, + { #name, arity, reinterpret_cast<pl_function_t>(name), 0 }, namespace { @@ -46,13 +47,13 @@ m4_divert(1)dnl } // namespace extern "C" install_t -install() { +install_libppl_swiprolog() { ppl_initialize(); PL_register_extensions(predicates); } extern "C" install_t -uninstall() { +uninstall_libppl_swiprolog() { ppl_finalize(); } m4_divert(-1) diff --git a/interfaces/Prolog/SWI/ppl_pl.cc b/interfaces/Prolog/SWI/ppl_pl.cc index c333362..86c35cd 100644 --- a/interfaces/Prolog/SWI/ppl_pl.cc +++ b/interfaces/Prolog/SWI/ppl_pl.cc @@ -21,10 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <SWI-Prolog.h> - -extern "C" install_t install(); -extern "C" install_t uninstall(); +#include "ppl_swiprolog.hh" +#include "swi_cfli.hh" int main(int argc, char **argv) { @@ -37,8 +35,8 @@ main(int argc, char **argv) { PL_halt(1); PL_install_readline(); - install(); + install_libppl_swiprolog(); int ret_val = PL_toplevel(); - uninstall(); + uninstall_libppl_swiprolog(); PL_halt(ret_val ? 0 : 1); } diff --git a/interfaces/Prolog/SWI/ppl_swiprolog.hh b/interfaces/Prolog/SWI/ppl_swiprolog.hh new file mode 100644 index 0000000..7339a0d --- /dev/null +++ b/interfaces/Prolog/SWI/ppl_swiprolog.hh @@ -0,0 +1,22 @@ +/* Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. */ + +#ifndef PPL_ppl_swiprolog_hh +#define PPL_ppl_swiprolog_hh 1 + +#include "swi_cfli.hh" + +extern "C" install_t install_libppl_swiprolog(); + +extern "C" install_t uninstall_libppl_swiprolog(); + +#endif // !defined(PPL_ppl_swiprolog_hh)

1 0