March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added the new pretty print functionality to Java, OCaml and Prolog interfaces.
by Enea Zaffanella 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: d9d0b1a6a92407a3a05e16e5216ce4835edbc364 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d9d0b1a6a924… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 21 21:35:36 2009 +0100 Added the new pretty print functionality to Java, OCaml and Prolog interfaces. The predicate takes 3 arguments for specifying preferred wrapping behavior. For Prolog, new predicate is called ppl_CLASS_pretty_print_to_atom/5 and put the result in the last argument as an atom. For Java, method takes a Writer as the first argument. For Caml, function ppl_CLASS_pretty_print returns a caml string. While at it, also added missing ascii_dump method to Caml and Java interfaces, as well as for the MIP_Problem Prolog interface. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 1 + interfaces/C/ppl_interface_generator_c_h_code.m4 | 1 + ...ppl_interface_generator_java_classes_cc_code.m4 | 31 ++ interfaces/Java/jni/ppl_java_globals.cc | 437 ++++++++++++++++++-- .../Java/parma_polyhedra_library/Congruence.java | 22 + .../parma_polyhedra_library/Congruence_System.java | 24 +- .../Java/parma_polyhedra_library/Constraint.java | 22 + .../parma_polyhedra_library/Constraint_System.java | 24 +- .../Java/parma_polyhedra_library/Generator.java | 22 + .../parma_polyhedra_library/Generator_System.java | 24 +- .../parma_polyhedra_library/Grid_Generator.java | 23 +- .../Grid_Generator_System.java | 24 +- .../parma_polyhedra_library/Linear_Expression.java | 24 +- .../Java/parma_polyhedra_library/MIP_Problem.java | 22 + .../ppl_interface_generator_java_classes_java.m4 | 3 + ...l_interface_generator_java_classes_java_code.m4 | 22 +- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 33 ++- .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 13 +- .../ppl_interface_generator_ocaml_mli_code.m4 | 64 ++-- interfaces/OCaml/ppl_ocaml_common.cc | 35 ++ interfaces/OCaml/ppl_ocaml_globals.ml | 8 + interfaces/OCaml/ppl_ocaml_globals.mli | 6 + .../ppl_interface_generator_prolog_cc_code.m4 | 31 ++ .../ppl_interface_generator_prolog_hh_code.m4 | 11 + ...erface_generator_prolog_procedure_generators.m4 | 4 +- interfaces/Prolog/ppl_prolog_common.cc | 42 ++ interfaces/Prolog/ppl_prolog_common.defs.hh | 17 +- ...erface_generator_common_procedure_generators.m4 | 1 + 28 files changed, 914 insertions(+), 77 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d9d0b1a6…

1 0

[GIT] ppl/ppl(master): Added a new helper function for the wrapping of lines.
by Roberto Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: aca3e12a7959550abe459bafdffc0dab09fa65f2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aca3e12a7959… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 21:36:38 2009 +0100 Added a new helper function for the wrapping of lines. --- src/pretty_print.cc | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/pretty_print.hh | 23 +++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/src/pretty_print.cc b/src/pretty_print.cc index fbcdfb9..697f5e6 100644 --- a/src/pretty_print.cc +++ b/src/pretty_print.cc @@ -184,6 +184,62 @@ size_t wrap(Write_Function& wfunc, return written; } +void +wrap(std::string& dst, const std::string& src_string, + unsigned indent_depth, + unsigned preferred_first_line_length, + unsigned preferred_line_length) { + dst.clear(); + const char *src = src_string.c_str(); + for (int line = 0; ; ++line) { + int linelen = (line == 0 + ? preferred_first_line_length + : preferred_line_length); + int last_comma = -1; + int last_space = -1; + int split_pos = -1; + int i; + for (i = 0; i <= linelen; ++i) { + if (src[i] == '\0' || src[i] == '\n') { + split_pos = i; + break; + } + if (src[i] == ',' && i < linelen) + last_comma = i; + if (isspace(src[i]) && (i == 0 || !isspace(src[i-1]))) + last_space = i; + } + if (split_pos < 0) { + if (last_comma >= 0) + split_pos = last_comma + 1; + else if (last_space >= 0) + split_pos = last_space; + else { + for ( ; src[i]; ++i) { + if (src[i] == ',') { + ++i; + break; + } + if (isspace(src[i])) + break; + } + split_pos = i; + } + } + if (split_pos > 0 && line > 0 && indent_depth > 0) + dst.append(indent_depth, ' '); + dst.append(src, split_pos); + src += split_pos; + if (isspace(*src)) + ++src; + while (*src == ' ') + ++src; + if (*src == '\0') + break; + dst.push_back('\n'); + } +} + } // namespace IO_Operators } // namespace Parma_Polyhedra_Library diff --git a/src/pretty_print.hh b/src/pretty_print.hh index 1156d85..de8aa57 100644 --- a/src/pretty_print.hh +++ b/src/pretty_print.hh @@ -138,6 +138,29 @@ c_pretty_print(const T& o, write_function wfunc, void* data, unsigned preferred_first_line_length, unsigned preferred_line_length); +//! Helper function for the wrapping of lines. +/*! + \param dst + The destination string. + + \param src + The source string holding the lines to wrap. + + \param indent_depth + The indentation depth. + + \param preferred_first_line_length + The preferred length for the first line of text. + + \param preferred_line_length + The preferred length for all the lines but the first one. +*/ +void +wrap(std::string& dst, const std::string& src_string, + unsigned indent_depth, + unsigned preferred_first_line_length, + unsigned preferred_line_length); + } // namespace IO_Operators } // namespace Parma_Polyhedra_Library

1 0

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

21 Mar '09

Module: ppl/ppl Branch: master Commit: 34bdedf290277a3612632c8af7d83a42566c3c2f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=34bdedf29027… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 19:58:52 2009 +0100 Typo fixed. --- NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index c704749..01aeca5 100644 --- a/NEWS +++ b/NEWS @@ -35,7 +35,7 @@ o The C interface now provides functions of the form int ppl_io_asprint_Polyhedron(char** strp, P x) where `P' is any opaque pointer to a const PPL object. These functions - prints `x' to a malloc-allocated string, a pointer to which is returned + print `x' to a malloc-allocated string, a pointer to which is returned via `strp'.

1 0

[GIT] ppl/ppl(master): The C interface now provides functions of the form
by Roberto Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 0a4e6716e62223f5854fe5bb54306063c591a9fb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0a4e6716e622… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 19:58:13 2009 +0100 The C interface now provides functions of the form int ppl_io_asprint_Polyhedron(char** strp, P x) where `P' is any opaque pointer to a const PPL object. These functions print `x' to a malloc-allocated string, a pointer to which is returned via `strp'. --- NEWS | 8 +++++++ interfaces/C/C_interface.dox | 7 ++++++ interfaces/C/ppl_c_header.h | 25 ++++++++++++++++++--- interfaces/C/ppl_c_implementation_common.cc | 12 ++++++++++ interfaces/C/ppl_c_implementation_common.defs.hh | 14 ++++++++++++ 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index edd6a2c..c704749 100644 --- a/NEWS +++ b/NEWS @@ -30,6 +30,14 @@ o The configuration script now explicitly checks that a recent enough enabled (in previous versions this check was not performed and building the library could fail in a mysterious way). +o The C interface now provides functions of the form + + int ppl_io_asprint_Polyhedron(char** strp, P x) + + where `P' is any opaque pointer to a const PPL object. These functions + prints `x' to a malloc-allocated string, a pointer to which is returned + via `strp'. + Bugfixes ======== diff --git a/interfaces/C/C_interface.dox b/interfaces/C/C_interface.dox index 2b3064b..d7ac170 100644 --- a/interfaces/C/C_interface.dox +++ b/interfaces/C/C_interface.dox @@ -1084,6 +1084,13 @@ ppl_io_print_Polyhedron(ppl_const_Polyhedron_t x); int ppl_io_fprint_Polyhedron(FILE* stream, ppl_const_Polyhedron_t x); +/*! \relates ppl_Polyhedron_tag \brief + Prints \p x to a malloc-allocated string, a pointer to which + is returned via \p strp. +*/ +int +ppl_io_asprint_Polyhedron(char** strp, ppl_const_Polyhedron_t x); + /*! \relates ppl_Polyhedron_tag \brief Dumps an ascii representation of \p x on \p stream. */ diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index d802196..8dd87d9 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -354,14 +354,25 @@ ppl_max_space_dimension PPL_PROTO((ppl_dimension_type* m)); int ppl_not_a_dimension PPL_PROTO((ppl_dimension_type* m)); -/*! \brief Pretty-prints \p var to <CODE>stdout</CODE>. */ +/*! \brief + Pretty-prints \p var to <CODE>stdout</CODE>. +*/ int ppl_io_print_variable PPL_PROTO((ppl_dimension_type var)); -/*! \brief Pretty-prints \p var to the given output \p stream. */ +/*! \brief + Pretty-prints \p var to the given output \p stream. +*/ int ppl_io_fprint_variable PPL_PROTO((FILE* stream, ppl_dimension_type var)); +/*! \relates ppl_Polyhedron_tag \brief + Pretty-prints \p var to a malloc-allocated string, a pointer to which + is returned via \p strp. +*/ +int +ppl_io_asprint_variable PPL_PROTO((char** strp, ppl_dimension_type var)); + /*! \brief The type of output functions used for printing variables. @@ -562,7 +573,10 @@ int \ ppl_io_print_##Type PPL_PROTO((ppl_const_##Type##_t x)); \ /*! \relates ppl_##Type##_tag */ \ int \ -ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); +ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); \ +/*! \relates ppl_##Type##_tag */ \ +int \ +ppl_io_asprint_##Type PPL_PROTO((char** strp, ppl_const_##Type##_t x)); #define PPL_DECLARE_ASCII_DUMP_LOAD_FUNCTIONS(Type) \ /*! \relates ppl_##Type##_tag */ \ @@ -584,7 +598,10 @@ int \ ppl_io_print_##Type PPL_PROTO((ppl_const_##Type##_t x)); \ /*! \relates ppl_##Type##_tag \brief Prints \p x to the given output \p stream. */ \ int \ -ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); +ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); \ +/*! \relates ppl_##Type##_tag \brief Pretty-prints \p x to a malloc-allocated string, a pointer to which is returned via \p strp. */ \ +int \ +ppl_io_asprint_##Type PPL_PROTO((char** strp, ppl_const_##Type##_t x)); #define PPL_DECLARE_AND_DOCUMENT_ASCII_DUMP_LOAD_FUNCTIONS(Type) \ diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 15be348..7eb8147 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -1991,6 +1991,18 @@ ppl_io_fprint_variable(FILE* stream, ppl_dimension_type var) try { } CATCH_ALL +int +ppl_io_asprint_variable(char** strp, ppl_dimension_type var) try { + const char* b = c_variable_output_function(var); + if (b == 0) + return PPL_STDIO_ERROR; + *strp = strdup(b); + if (*strp == 0) + return PPL_ERROR_OUT_OF_MEMORY; + return 0; +} +CATCH_ALL + /* No ascii dump for Coefficient. */ DEFINE_PRINT_FUNCTIONS(Coefficient) diff --git a/interfaces/C/ppl_c_implementation_common.defs.hh b/interfaces/C/ppl_c_implementation_common.defs.hh index 6d8be11..b85c443 100644 --- a/interfaces/C/ppl_c_implementation_common.defs.hh +++ b/interfaces/C/ppl_c_implementation_common.defs.hh @@ -164,6 +164,20 @@ catch (...) { \ return PPL_STDIO_ERROR; \ return 0; \ } \ + CATCH_ALL \ + \ + int \ + ppl_io_asprint_##Type(char** strp, ppl_const_##Type##_t x) try { \ + using namespace IO_Operators; \ + std::ostringstream os; \ + os << *to_const(x); \ + if (!os) \ + return PPL_STDIO_ERROR; \ + *strp = strdup(os.str().c_str()); \ + if (*strp == 0) \ + return PPL_ERROR_OUT_OF_MEMORY; \ + return 0; \ + } \ CATCH_ALL #define DEFINE_ASCII_DUMP_FUNCTIONS(Type) \

1 0

[GIT] ppl/ppl(master): Selected the items that should be done for 0.10.1: postponed the others.
by Roberto Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 0f62fe5b7218528e8ff53dd41d7894d3b5dd1b1c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f62fe5b7218… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 15:28:10 2009 +0100 Selected the items that should be done for 0.10.1: postponed the others. --- TODO | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TODO b/TODO index 9e5d8f8..49aff25 100644 --- a/TODO +++ b/TODO @@ -8,24 +8,24 @@ Enhancements for PPL 0.10.1 or later versions or not, with failure or not), the latter `make check' can succeed without testing anything. - Do not enable the Prolog interfaces by default in the release tarballs. -- Improve the OCaml interface by supporting dynamic loading. -- Enhance the support for systems not providing support for the IEEE - inexact flag. -- `make check' in ppl_lpsol must run also the incremental version - of the simplex solver. -- Complete the implementation of the --enable-check configure option. - Explain it in README.configure. - Explain the `--enable-ppl_lcdd' and `--enable-ppl_lpsol' in README.configure. -- Intervals are best instantiated with checked numbers with - particular policies: review all the interfaced boxes, - augment the testsuite, and update the documentation. - Check the configuration dependent documentation for Prolog, Enhancements for PPL 0.11 or later versions =========================================== +- Intervals are best instantiated with checked numbers with + particular policies: review all the interfaced boxes, + augment the testsuite, and update the documentation. +- Improve the OCaml interface by supporting dynamic loading. +- Enhance the support for systems not providing support for the IEEE + inexact flag. +- `make check' in ppl_lpsol must run also the incremental version + of the simplex solver. +- Complete the implementation of the --enable-check configure option. + Explain it in README.configure. - Make the library thread-safe. - Find a way to let the GMP and checked-int versions of the PPL coexist so as to allow using them in the same application.

1 0

[GIT] ppl/ppl(master): Two non-urgent FIXMEs better documented.
by Roberto Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 4280bc6f3e284b36f7cef0412733a44c28b08cd2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4280bc6f3e28… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 15:26:09 2009 +0100 Two non-urgent FIXMEs better documented. --- src/Determinate.inlines.hh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Determinate.inlines.hh b/src/Determinate.inlines.hh index c14927a..9aee467 100644 --- a/src/Determinate.inlines.hh +++ b/src/Determinate.inlines.hh @@ -178,14 +178,18 @@ Determinate<PS>::meet_assign(const Determinate& y) { template <typename PS> inline bool Determinate<PS>::has_nontrivial_weakening() { - // FIXME(0.10.1) - return true; + // FIXME: the following should be turned into a query to PS. This + // can be postponed until the time the ask-and-tell construction is + // revived. + return false; } template <typename PS> inline void Determinate<PS>::weakening_assign(const Determinate& y) { - // FIXME(0.10.1) + // FIXME: the following should be turned into a proper + // implementation. This can be postponed until the time the + // ask-and-tell construction is revived. element().difference_assign(y.element()); }

1 0

[GIT] ppl/ppl(master): Added callback based streambufs.
by Abramo Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 8764c47130fdceb681e539b9aa58b0767cb38bd3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8764c47130fd… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 21 12:17:48 2009 +0100 Added callback based streambufs. --- src/Makefile.am | 4 ++ src/c_streambuf.cc | 101 ++++++++++++++++++++++++++++++++++++ src/c_streambuf.defs.hh | 121 ++++++++++++++++++++++++++++++++++++++++++++ src/c_streambuf.inlines.hh | 35 +++++++++++++ src/c_streambuf.types.hh | 21 ++++++++ 5 files changed, 282 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 83a2ad6..cc3fc03 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -123,6 +123,7 @@ Checked_Number.types.hh \ $(COEFFICIENT_TYPES_INCLUDE_FILES) \ Coefficient.types.hh \ stdiobuf.types.hh \ +c_streambuf.types.hh \ globals.types.hh \ iterator_to_const.types.hh \ distances.types.hh \ @@ -194,6 +195,8 @@ Coefficient.defs.hh \ Coefficient.inlines.hh \ stdiobuf.defs.hh \ stdiobuf.inlines.hh \ +c_streambuf.defs.hh \ +c_streambuf.inlines.hh \ globals.defs.hh \ globals.inlines.hh \ math_utilities.defs.hh \ @@ -393,6 +396,7 @@ simplify.cc \ Grid_conversion.cc \ Grid_simplify.cc \ stdiobuf.cc \ +c_streambuf.cc \ globals.cc \ mp_std_bits.cc \ version.cc \ diff --git a/src/c_streambuf.cc b/src/c_streambuf.cc new file mode 100644 index 0000000..f8a8065 --- /dev/null +++ b/src/c_streambuf.cc @@ -0,0 +1,101 @@ +/* c_streambuf class implementation (non-inline functions). + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +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 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#include <ppl-config.h> + +#include "c_streambuf.defs.hh" + +namespace Parma_Polyhedra_Library { + +c_streambuf::int_type +c_streambuf::uflow() { + int_type c = underflow(); + nextc_buf = traits_type::eof(); + return c; +} + +c_streambuf::int_type +c_streambuf::underflow() { + const int_type eof = traits_type::eof(); + if (traits_type::eq_int_type(nextc_buf, eof)) { + char buf; + if (read(data, &buf, 1) != 1) + nextc_buf = eof; + else + nextc_buf = buf; + } + return nextc_buf; +} + +std::streamsize +c_streambuf::xsgetn(char_type* s, std::streamsize n) { + if (n == 0) + return n; + const int_type eof = traits_type::eof(); + int a; + if (traits_type::eq_int_type(nextc_buf, eof)) + a = 0; + else { + s[0] = nextc_buf; + a = 1; + } + std::streamsize r = read(data, s + a, n - a) + a; + if (r > 0) + ungetc_buf = traits_type::to_int_type(s[r - 1]); + else + ungetc_buf = traits_type::eof(); + return r; +} + +c_streambuf::int_type +c_streambuf::pbackfail(int_type c) { + const int_type eof = traits_type::eof(); + nextc_buf = traits_type::eq_int_type(c, eof) ? ungetc_buf : c; + ungetc_buf = eof; + return nextc_buf; +} + +std::streamsize +c_streambuf::xsputn(const char_type* s, std::streamsize n) { + return write(data, s, n); +} + +c_streambuf::int_type +c_streambuf::overflow(int_type c) { + const int_type eof = traits_type::eof(); + if (traits_type::eq_int_type(c, eof)) + return sync() ? eof : traits_type::not_eof(c); + else { + char buf = c; + if (write(data, &buf, 1) != 1) + return eof; + else + return c; + } +} + +int +c_streambuf::sync() { + return 0; +} + +} // namespace Parma_Polyhedra_Library diff --git a/src/c_streambuf.defs.hh b/src/c_streambuf.defs.hh new file mode 100644 index 0000000..d58d918 --- /dev/null +++ b/src/c_streambuf.defs.hh @@ -0,0 +1,121 @@ +/* c_streambuf class declaration. + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +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 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#ifndef PPL_c_streambuf_defs_hh +#define PPL_c_streambuf_defs_hh 1 + +#include "c_streambuf.types.hh" +#include <streambuf> + +typedef size_t (*read_function)(void* data, void *buf, size_t size); +typedef size_t (*write_function)(void* data, const void *buf, size_t size); + +class Parma_Polyhedra_Library::c_streambuf + : public std::basic_streambuf<char, std::char_traits<char> > { +public: + //! Constructor. + c_streambuf(read_function read, write_function write, void *data); + +protected: + /*! \brief + Gets a character in case of underflow. + + \remarks + Specified by ISO/IEC 14882:1998: 27.5.2.4.3. + */ + int_type underflow(); + + /*! \brief + In case of underflow, gets a character and advances the next pointer. + + \remarks + Specified by ISO/IEC 14882:1998: 27.5.2.4.3. + */ + int_type uflow(); + + /*! \brief + Gets a sequence of characters. + + \remarks + Specified by ISO/IEC 14882:1998: 27.5.2.4.3. + */ + std::streamsize xsgetn(char_type* s, std::streamsize n); + + /*! \brief + Puts character back in case of backup underflow. + + \remarks + Specified by ISO/IEC 14882:1998: 27.5.2.4.4. + */ + int_type pbackfail(int_type c = traits_type::eof()); + + /*! \brief + Writes a sequence of characters. + + \remarks + Specified by ISO/IEC 14882:1998: 27.5.2.4.5. + */ + std::streamsize xsputn(const char_type* s, std::streamsize n); + + /*! \brief + Writes a character in case of overflow. + + Specified by ISO/IEC 14882:1998: 27.5.2.4.5. + */ + int_type overflow(int_type c); + + /*! \brief + Synchronizes the stream buffer. + + Specified by ISO/IEC 14882:1998: 27.5.2.4.2. + */ + int sync(); + +private: + //! Character type of the streambuf. + typedef char char_type; + + //! Traits type of the streambuf. + typedef std::char_traits<char_type> traits_type; + + //! Integer type of the streambuf. + typedef traits_type::int_type int_type; + + //! The read callback + read_function read; + + //! The write callback + write_function write; + + //! The callback data + void *data; + + //! Buffer for the last character read. + int_type ungetc_buf; + + //! Buffer for next character + int_type nextc_buf; +}; + +#include "c_streambuf.inlines.hh" + +#endif // !defined(PPL_c_streambuf_defs_hh) diff --git a/src/c_streambuf.inlines.hh b/src/c_streambuf.inlines.hh new file mode 100644 index 0000000..709d873 --- /dev/null +++ b/src/c_streambuf.inlines.hh @@ -0,0 +1,35 @@ +/* c_streambuf class implementation: inline functions. + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +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 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#ifndef PPL_c_streambuf_inlines_hh +#define PPL_c_streambuf_inlines_hh 1 + +namespace Parma_Polyhedra_Library { + +inline +c_streambuf::c_streambuf(read_function read, write_function write, void* data) + : read(read), write(write), data(data), ungetc_buf(traits_type::eof()) { +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_c_streambuf_inlines_hh) diff --git a/src/c_streambuf.types.hh b/src/c_streambuf.types.hh new file mode 100644 index 0000000..c9aea28 --- /dev/null +++ b/src/c_streambuf.types.hh @@ -0,0 +1,21 @@ +/* Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +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_c_streambuf_types_hh +#define PPL_c_streambuf_types_hh 1 + +namespace Parma_Polyhedra_Library { + +class c_streambuf; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_c_streambuf_types_hh)

1 0

[GIT] ppl/ppl(master): Fixed typo.
by Abramo Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 23ddce2126147ad3869c6873685f7c2b3ed249fa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23ddce212614… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 21 12:07:27 2009 +0100 Fixed typo. --- src/stdiobuf.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/stdiobuf.cc b/src/stdiobuf.cc index 9f21232..a0323e1 100644 --- a/src/stdiobuf.cc +++ b/src/stdiobuf.cc @@ -41,7 +41,7 @@ stdiobuf::underflow() { std::streamsize stdiobuf::xsgetn(char_type* s, std::streamsize n) { std::streamsize r = fread(s, 1, n, fp); - if (s > 0) + if (r > 0) ungetc_buf = traits_type::to_int_type(s[r - 1]); else ungetc_buf = traits_type::eof();

1 0

[GIT] ppl/ppl(master): Minimum Autoconf version brought back to 2.61.
by Roberto Bagnara 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: 3f1a2c86b6d056cccf64e3a77659388fbe1ba878 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f1a2c86b6d0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 21 11:39:25 2009 +0100 Minimum Autoconf version brought back to 2.61. --- Watchdog/configure.ac | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac index c9a2cf3..4a706ad 100644 --- a/Watchdog/configure.ac +++ b/Watchdog/configure.ac @@ -26,7 +26,7 @@ AC_INIT([the Parma Watchdog Library],[0.5],[bagnara(a)cs.unipr.it],[pwl]) # Minimum Autoconf version required. -AC_PREREQ(2.63) +AC_PREREQ(2.61) # Make sure the sources are there. AC_CONFIG_SRCDIR(src/Watchdog.cc) diff --git a/configure.ac b/configure.ac index 92b3e2c..3d6e724 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_INIT([the Parma Polyhedra Library],[0.10.1pre7],[ppl-devel(a)cs.unipr.it],[ppl]) # Minimum Autoconf version required. -AC_PREREQ(2.63) +AC_PREREQ(2.61) # Make sure the sources are there. AC_CONFIG_SRCDIR(src/Polyhedron_public.cc)

1 0

[GIT] ppl/ppl(master): Added files pretty_print.*.
by Enea Zaffanella 21 Mar '09

21 Mar '09

Module: ppl/ppl Branch: master Commit: ea6344b733e9bbe0d30b40c5ebaba44a6c575de8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ea6344b733e9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 21 10:05:00 2009 +0100 Added files pretty_print.*. --- src/Makefile.am | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 279196e..83a2ad6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -318,7 +318,9 @@ Partially_Reduced_Product.defs.hh \ Partially_Reduced_Product.inlines.hh \ Partially_Reduced_Product.templates.hh \ max_space_dimension.hh \ -algorithms.hh +algorithms.hh \ +pretty_print.hh \ +pretty_print.inlines.hh #Any_Pointset.types.hh \ #Any_Pointset.defs.hh \ #Any_Pointset.inlines.hh \ @@ -396,7 +398,8 @@ mp_std_bits.cc \ version.cc \ $(INCLUDE_FILES) \ $(NESTED_INCLUDE_FILES) \ -swapping_sort.icc +swapping_sort.icc \ +pretty_print.cc #Pointset_Ask_Tell.cc if NO_UNDEFINED

1 0