March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Some fixes.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: d810281e8e849525c7e651152bedc21efe4b9a9b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d810281e8e84… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 21:23:30 2009 +0100 Some fixes. --- interfaces/C/tests/print_to_buffer.c | 8 ++------ interfaces/C/tests/print_to_buffer.h | 4 ++-- src/c_stream.h | 30 ++++++++++++++++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index cafd0e5..5de5698 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -25,9 +25,9 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <malloc.h> #include <string.h> -#define DEFINE_PRINT_TO_BUFFER(Type) \ +#define DEFINE_PRINT_TO_BUFFER(Name) \ char* \ -print_##Name##_to_buffer(##Type p, \ +print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned pfll, \ unsigned pll) { \ @@ -71,9 +71,6 @@ print_##Name##_to_buffer(##Type p, \ return buf; \ } -DEFINE_PRINT_TO_BUFFER(string, char); - -#if 0 DEFINE_PRINT_TO_BUFFER(Coefficient) DEFINE_PRINT_TO_BUFFER(Linear_Expression) @@ -95,4 +92,3 @@ DEFINE_PRINT_TO_BUFFER(Grid_Generator) DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) DEFINE_PRINT_TO_BUFFER(MIP_Problem) -#endif diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index 83e57f3..f565f94 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -33,9 +33,9 @@ site: http://www.cs.unipr.it/ppl/ . */ `preferred_first_line_length' and `preferred_line_length', respectively. */ -#define DECLARE_PRINT_TO_BUFFER(Name, Type) \ +#define DECLARE_PRINT_TO_BUFFER(Name) \ char* \ -print_##Name##_to_buffer(##Type p, \ +print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned preferred_first_line_length, \ unsigned preferred_line_length); diff --git a/src/c_stream.h b/src/c_stream.h index 23ca3ff..e8857ee 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -46,33 +46,33 @@ enum ppl_io_format_line_type { #define PPL_IO_FORMAT_WRAP_POINTS 2 struct ppl_io_format_settings { - // Char conversion table + /* Char conversion table */ const char *tr_in; const char *tr_out; - // String for detect end of paragraph + /* String for detect end of paragraph */ const char *paragraph_end; - // Lines can be wrapped on any of this characters - // If none from wrap_at[n] is found then wrap_at[n+1] is used. + /* Lines can be wrapped on any of this characters */ + /* If none from wrap_at[n] is found then wrap_at[n+1] is used. */ struct { const char *before; const char *after; } wrap_points[PPL_IO_FORMAT_WRAP_POINTS]; - // Any of these characters are stripped at and after wrap point + /* Any of these characters are stripped at and after wrap point */ const char *strip_wrap; - // This string is put at beginning of paragraph + /* This string is put at beginning of paragraph */ const char *top; - // This string is put at end of paragraph + /* This string is put at end of paragraph */ const char *bottom; struct { - // Length of line + /* Length of line */ unsigned int length; - // Left margin string + /* Left margin string */ const char *left; - // Right margin string + /* Right margin string */ const char *right; - // 0 left, 8 center, 16 right + /* 0 left, 8 center, 16 right */ unsigned int alignment; - // This char is used to fill line length + /* This char is used to fill line length */ char fill_char; } lines[PPL_IO_FORMAT_LINE_END]; }; @@ -90,8 +90,8 @@ void ppl_io_ostream_buffer_clear(struct ppl_io_ostream* stream); int ppl_io_write_endl(struct ppl_io_ostream* s); -// FIXME: -// Add ios_base methods: flags, setf, unsetf, width, precision (others?) +/* FIXME: */ +/* Add ios_base methods: flags, setf, unsetf, width, precision (others?) */ #define DECLARE_WRITE_VAL(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type o) #define DECLARE_WRITE_REF(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type* o) @@ -105,8 +105,10 @@ DECLARE_WRITE_VAL(int, int); DECLARE_WRITE_VAL(unsigned_int, unsigned int); DECLARE_WRITE_VAL(long, long); DECLARE_WRITE_VAL(unsigned_long, unsigned long); +/* DECLARE_WRITE_VAL(long_long, long long); DECLARE_WRITE_VAL(unsigned_long_long, unsigned long long); +*/ DECLARE_WRITE_VAL(float, float); DECLARE_WRITE_VAL(double, double); DECLARE_WRITE_VAL(long_double, long double);

1 0

[GIT] ppl/ppl(master): Done some cleaning.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: 9b0fdf18dcd89a8e4a3bfadd2ab9dd8388ee8578 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9b0fdf18dcd8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 21:09:10 2009 +0100 Done some cleaning. --- interfaces/C/tests/Makefile.am | 7 +- .../C/tests/{cxxoutput.c => formatted_output.c} | 0 interfaces/C/tests/print_to_buffer.cc | 172 -------------------- 3 files changed, 5 insertions(+), 174 deletions(-) diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index 744a53b..f880ed7 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -49,13 +49,16 @@ libppl_c_tests.a \ @extra_libraries@ NORMAL_TESTS = \ -cxxoutput +formatted_output # # Sources for the tests # -cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.c +formatted_output_SOURCES = \ +formatted_output.c \ +print_to_buffer.h \ +print_to_buffer.c #watchdog1_SRCS = watchdog1.cc diff --git a/interfaces/C/tests/cxxoutput.c b/interfaces/C/tests/formatted_output.c similarity index 100% rename from interfaces/C/tests/cxxoutput.c rename to interfaces/C/tests/formatted_output.c diff --git a/interfaces/C/tests/print_to_buffer.cc b/interfaces/C/tests/print_to_buffer.cc deleted file mode 100644 index d7fcfba..0000000 --- a/interfaces/C/tests/print_to_buffer.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* Declarations of print_ppl_*_t_to_buffer() 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.hh" -#include "ppl_c.h" -#include "print_to_buffer.h" -#include <sstream> -#include <cassert> -#include <iostream> -#include <cstring> -#include <cctype> - -#define DEFINE_PRINT_TO_BUFFER(Type) \ -char* \ -print_ppl_##Type##_t_to_buffer(ppl_##Type##_t p, \ - unsigned indent_depth, \ - unsigned preferred_first_line_length, \ - unsigned preferred_line_length) { \ - using namespace Parma_Polyhedra_Library; \ - return print_to_buffer(*reinterpret_cast<const Type*>(p), \ - indent_depth, \ - preferred_first_line_length, \ - preferred_line_length); \ -} - -namespace { - -size_t -wrap_to_buffer(char *buf, - size_t buf_size, - const char* src, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { - char* dst = buf; - size_t len = 0; - 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) { - i = buf_size - len; - if (i >= 0) { - if (i > (int) indent_depth) - i = indent_depth; - memset(dst, ' ', i); - dst += i; - } - len += indent_depth; - } - i = buf_size - len; - if (i >= 0) { - if (i > split_pos) - i = split_pos; - memcpy(dst, src, i); - dst += i; - } - src += split_pos; - len += split_pos; - if (isspace(*src)) - ++src; - while (*src == ' ') - ++src; - if (*src == '\0') - break; - if (len < buf_size) - *dst++ = '\n'; - ++len; - } - if (len < buf_size) - *dst++ = '\0'; - ++len; - return len; -} - -template <typename T> -char* -print_to_buffer(const T& o, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { - using namespace Parma_Polyhedra_Library::IO_Operators; - std::ostringstream s; - s << o; - std::string str = s.str(); - const char* c_str = str.c_str(); - size_t buf_size = wrap_to_buffer(0, 0, c_str, - indent_depth, - preferred_first_line_length, - preferred_line_length); - char* buf = (char*) malloc(buf_size); - if (buf != 0) - wrap_to_buffer(buf, buf_size, c_str, - indent_depth, - preferred_first_line_length, - preferred_line_length); - return buf; -} - -} // namespace - -DEFINE_PRINT_TO_BUFFER(Coefficient) - -DEFINE_PRINT_TO_BUFFER(Linear_Expression) - -DEFINE_PRINT_TO_BUFFER(Constraint) - -DEFINE_PRINT_TO_BUFFER(Constraint_System) - -DEFINE_PRINT_TO_BUFFER(Generator) - -DEFINE_PRINT_TO_BUFFER(Generator_System) - -DEFINE_PRINT_TO_BUFFER(Congruence) - -DEFINE_PRINT_TO_BUFFER(Congruence_System) - -DEFINE_PRINT_TO_BUFFER(Grid_Generator) - -DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) - -DEFINE_PRINT_TO_BUFFER(MIP_Problem)

1 0

[GIT] ppl/ppl(formatted_output): Added repeated char for left and right margin.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: bace9caed4ba2aba49450798390a526501db70bd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bace9caed4ba… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 22:16:56 2009 +0100 Added repeated char for left and right margin. --- interfaces/C/tests/print_to_buffer.c | 55 +++++++++++++++++++++------------- src/c_stream.cc | 24 +++++++------- src/c_stream.h | 8 +++++ src/c_streambuf_format.cc | 5 +++ 4 files changed, 59 insertions(+), 33 deletions(-) diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index 5de5698..87a81e4 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -31,9 +31,6 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned pfll, \ unsigned pll) { \ - char in[indent_depth + 1]; \ - memset(in, ' ', indent_depth); \ - in[indent_depth] = '\0'; \ struct ppl_io_format_settings settings = { \ 0, /* tr_in */ \ 0, /* tr_out */ \ @@ -46,26 +43,42 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ 0, /* top */ \ 0, /* bottom */ \ { \ - /* length, left, right, alignment, fill_char */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ - { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ - { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ - { pfll, "", "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ - { pll, in, "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ - } \ + /* length, left, left_n, left_c, right_n, right_c right, alignment, fill_char */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ + { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ + } \ }; \ - struct ppl_io_ostream* target = ppl_io_ostream_buffer_new(); \ - struct ppl_io_ostream* stream = ppl_io_ostream_format_new(target, &settings); \ - ppl_io_write_##NAME(stream, object); \ - ppl_io_ostream_delete(stream); \ + struct ppl_io_ostream *target, *stream; \ char *buf; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].left_n = indent_depth; \ + target = ppl_io_ostream_buffer_new(); \ + stream = ppl_io_ostream_format_new(target, &settings); \ + ppl_io_write_##Name(stream, p); \ + ppl_io_ostream_delete(stream); \ ppl_io_ostream_buffer_get(target, &buf); \ ppl_io_ostream_delete(target); \ return buf; \ diff --git a/src/c_stream.cc b/src/c_stream.cc index 6b3b20b..11ea69e 100644 --- a/src/c_stream.cc +++ b/src/c_stream.cc @@ -34,18 +34,18 @@ ppl_io_format_settings ppl_io_format_default_settings = { 0, // bottom { // length, left, right, alignment, fill_char - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_LAST - { 80, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // UNTERMINATED_FIRST - { 80, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 } // UNTERMINATED_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_LAST + { 80, 0, 0, 0, 0, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // UNTERMINATED_FIRST + { 80, 0, 0, 0, 0, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 } // UNTERMINATED_NEXT } }; diff --git a/src/c_stream.h b/src/c_stream.h index e8857ee..3c8454d 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -68,6 +68,14 @@ struct ppl_io_format_settings { unsigned int length; /* Left margin string */ const char *left; + /* Left margin repeated char count */ + unsigned int left_n; + /* Left margin repeated char */ + char left_c; + /* Right margin repeated char count */ + unsigned int right_n; + /* Right margin repeated char */ + unsigned int right_c; /* Right margin string */ const char *right; /* 0 left, 8 center, 16 right */ diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc index 368a494..5d94ac6 100644 --- a/src/c_streambuf_format.cc +++ b/src/c_streambuf_format.cc @@ -145,6 +145,9 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma } if (settings->lines[type].left) stream << settings->lines[type].left; + unsigned int i; + for (i = 0; i < settings->lines[type].left_n; ++i) + stream.put(settings->lines[type].left_c); if (settings->lines[type].fill_char && n < settings->lines[type].length) { unsigned int left = 0; unsigned int right = 0; @@ -160,6 +163,8 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma } else stream.write(s, n); + for (i = 0; i < settings->lines[type].right_n; ++i) + stream.put(settings->lines[type].right_c); if (settings->lines[type].right) stream << settings->lines[type].right; switch (type) {

1 0

[GIT] ppl/ppl(formatted_output): Some fixes.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: d810281e8e849525c7e651152bedc21efe4b9a9b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d810281e8e84… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 21:23:30 2009 +0100 Some fixes. --- interfaces/C/tests/print_to_buffer.c | 8 ++------ interfaces/C/tests/print_to_buffer.h | 4 ++-- src/c_stream.h | 30 ++++++++++++++++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index cafd0e5..5de5698 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -25,9 +25,9 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <malloc.h> #include <string.h> -#define DEFINE_PRINT_TO_BUFFER(Type) \ +#define DEFINE_PRINT_TO_BUFFER(Name) \ char* \ -print_##Name##_to_buffer(##Type p, \ +print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned pfll, \ unsigned pll) { \ @@ -71,9 +71,6 @@ print_##Name##_to_buffer(##Type p, \ return buf; \ } -DEFINE_PRINT_TO_BUFFER(string, char); - -#if 0 DEFINE_PRINT_TO_BUFFER(Coefficient) DEFINE_PRINT_TO_BUFFER(Linear_Expression) @@ -95,4 +92,3 @@ DEFINE_PRINT_TO_BUFFER(Grid_Generator) DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) DEFINE_PRINT_TO_BUFFER(MIP_Problem) -#endif diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index 83e57f3..f565f94 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -33,9 +33,9 @@ site: http://www.cs.unipr.it/ppl/ . */ `preferred_first_line_length' and `preferred_line_length', respectively. */ -#define DECLARE_PRINT_TO_BUFFER(Name, Type) \ +#define DECLARE_PRINT_TO_BUFFER(Name) \ char* \ -print_##Name##_to_buffer(##Type p, \ +print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned preferred_first_line_length, \ unsigned preferred_line_length); diff --git a/src/c_stream.h b/src/c_stream.h index 23ca3ff..e8857ee 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -46,33 +46,33 @@ enum ppl_io_format_line_type { #define PPL_IO_FORMAT_WRAP_POINTS 2 struct ppl_io_format_settings { - // Char conversion table + /* Char conversion table */ const char *tr_in; const char *tr_out; - // String for detect end of paragraph + /* String for detect end of paragraph */ const char *paragraph_end; - // Lines can be wrapped on any of this characters - // If none from wrap_at[n] is found then wrap_at[n+1] is used. + /* Lines can be wrapped on any of this characters */ + /* If none from wrap_at[n] is found then wrap_at[n+1] is used. */ struct { const char *before; const char *after; } wrap_points[PPL_IO_FORMAT_WRAP_POINTS]; - // Any of these characters are stripped at and after wrap point + /* Any of these characters are stripped at and after wrap point */ const char *strip_wrap; - // This string is put at beginning of paragraph + /* This string is put at beginning of paragraph */ const char *top; - // This string is put at end of paragraph + /* This string is put at end of paragraph */ const char *bottom; struct { - // Length of line + /* Length of line */ unsigned int length; - // Left margin string + /* Left margin string */ const char *left; - // Right margin string + /* Right margin string */ const char *right; - // 0 left, 8 center, 16 right + /* 0 left, 8 center, 16 right */ unsigned int alignment; - // This char is used to fill line length + /* This char is used to fill line length */ char fill_char; } lines[PPL_IO_FORMAT_LINE_END]; }; @@ -90,8 +90,8 @@ void ppl_io_ostream_buffer_clear(struct ppl_io_ostream* stream); int ppl_io_write_endl(struct ppl_io_ostream* s); -// FIXME: -// Add ios_base methods: flags, setf, unsetf, width, precision (others?) +/* FIXME: */ +/* Add ios_base methods: flags, setf, unsetf, width, precision (others?) */ #define DECLARE_WRITE_VAL(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type o) #define DECLARE_WRITE_REF(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type* o) @@ -105,8 +105,10 @@ DECLARE_WRITE_VAL(int, int); DECLARE_WRITE_VAL(unsigned_int, unsigned int); DECLARE_WRITE_VAL(long, long); DECLARE_WRITE_VAL(unsigned_long, unsigned long); +/* DECLARE_WRITE_VAL(long_long, long long); DECLARE_WRITE_VAL(unsigned_long_long, unsigned long long); +*/ DECLARE_WRITE_VAL(float, float); DECLARE_WRITE_VAL(double, double); DECLARE_WRITE_VAL(long_double, long double);

1 0

[GIT] ppl/ppl(master): Started the installation of the new formatted output machinery.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: 52f81f97569aa58d4aa87af0a042d9741c5c515d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52f81f97569a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 20:54:14 2009 +0100 Started the installation of the new formatted output machinery. --- interfaces/C/Makefile.am | 4 +- interfaces/C/ppl_c_header.h | 2 + interfaces/C/tests/Makefile.am | 2 +- interfaces/C/tests/print_to_buffer.c | 98 ++++++++++++++++++++++++++++++++++ interfaces/C/tests/print_to_buffer.h | 11 ++-- src/c_stream.h | 27 +++++++++ 6 files changed, 136 insertions(+), 8 deletions(-) diff --git a/interfaces/C/Makefile.am b/interfaces/C/Makefile.am index cffb11e..e1db90f 100644 --- a/interfaces/C/Makefile.am +++ b/interfaces/C/Makefile.am @@ -73,9 +73,9 @@ LIBPPL_C_LT_CURRENT = 2 LIBPPL_C_LT_REVISION = 0 LIBPPL_C_LT_AGE = 0 -ppl_c.h: ppl_c_header.h ppl_c_version.h ppl_c_domains.h Makefile $(top_builddir)/utils/build_header +ppl_c.h: ppl_c_header.h ppl_c_version.h ppl_c_domains.h $(top_srcdir)/src/c_stream.h Makefile $(top_builddir)/utils/build_header $(top_builddir)/utils/build_header \ - -I $(top_builddir)/interfaces/C \ + -I $(top_builddir)/interfaces/C -I $(top_srcdir)/src \ $(top_srcdir)/interfaces/C/ppl_c_header.h >$@ BUILT_SOURCES = \ diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 8dd87d9..6f96cab 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2463,4 +2463,6 @@ PPL_DECLARE_AND_DOCUMENT_IO_FUNCTIONS(MIP_Problem) #undef PPL_DECLARE_AND_DOCUMENT_ASCII_DUMP_LOAD_FUNCTIONS #undef PPL_DECLARE_AND_DOCUMENT_IO_FUNCTIONS +#include "c_stream.h" + #endif /* !defined(PPL_ppl_c_h) */ diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index a5260c0..744a53b 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -55,7 +55,7 @@ cxxoutput # Sources for the tests # -cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.cc +cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.c #watchdog1_SRCS = watchdog1.cc diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c new file mode 100644 index 0000000..cafd0e5 --- /dev/null +++ b/interfaces/C/tests/print_to_buffer.c @@ -0,0 +1,98 @@ +/* Declarations of print_ppl_*_t_to_buffer() 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_c.h" +#include "print_to_buffer.h" +#include <malloc.h> +#include <string.h> + +#define DEFINE_PRINT_TO_BUFFER(Type) \ +char* \ +print_##Name##_to_buffer(##Type p, \ + unsigned indent_depth, \ + unsigned pfll, \ + unsigned pll) { \ + char in[indent_depth + 1]; \ + memset(in, ' ', indent_depth); \ + in[indent_depth] = '\0'; \ + struct ppl_io_format_settings settings = { \ + 0, /* tr_in */ \ + 0, /* tr_out */ \ + "\n", /* paragraph_end */ \ + { /* wrap points */ \ + { 0, "," }, /* before, after */ \ + { " ", 0 } /* before, aftet */ \ + }, \ + " ", /* strip_wrap */ \ + 0, /* top */ \ + 0, /* bottom */ \ + { \ + /* length, left, right, alignment, fill_char */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ + { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ + { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ + { pfll, "", "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ + { pll, in, "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ + } \ + }; \ + struct ppl_io_ostream* target = ppl_io_ostream_buffer_new(); \ + struct ppl_io_ostream* stream = ppl_io_ostream_format_new(target, &settings); \ + ppl_io_write_##NAME(stream, object); \ + ppl_io_ostream_delete(stream); \ + char *buf; \ + ppl_io_ostream_buffer_get(target, &buf); \ + ppl_io_ostream_delete(target); \ + return buf; \ +} + +DEFINE_PRINT_TO_BUFFER(string, char); + +#if 0 +DEFINE_PRINT_TO_BUFFER(Coefficient) + +DEFINE_PRINT_TO_BUFFER(Linear_Expression) + +DEFINE_PRINT_TO_BUFFER(Constraint) + +DEFINE_PRINT_TO_BUFFER(Constraint_System) + +DEFINE_PRINT_TO_BUFFER(Generator) + +DEFINE_PRINT_TO_BUFFER(Generator_System) + +DEFINE_PRINT_TO_BUFFER(Congruence) + +DEFINE_PRINT_TO_BUFFER(Congruence_System) + +DEFINE_PRINT_TO_BUFFER(Grid_Generator) + +DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) + +DEFINE_PRINT_TO_BUFFER(MIP_Problem) +#endif diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index 1e8f9ef..83e57f3 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -33,11 +33,12 @@ site: http://www.cs.unipr.it/ppl/ . */ `preferred_first_line_length' and `preferred_line_length', respectively. */ -#define DECLARE_PRINT_TO_BUFFER(Type) \ -char* print_ppl_##Type##_t_to_buffer(ppl_##Type##_t p, \ - unsigned indent_depth, \ - unsigned preferred_first_line_length, \ - unsigned preferred_line_length); +#define DECLARE_PRINT_TO_BUFFER(Name, Type) \ +char* \ +print_##Name##_to_buffer(##Type p, \ + unsigned indent_depth, \ + unsigned preferred_first_line_length, \ + unsigned preferred_line_length); #ifdef __cplusplus extern "C" { diff --git a/src/c_stream.h b/src/c_stream.h index ccde3af..23ca3ff 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -1,3 +1,28 @@ +/* Declarations for the formmatted output facility. + 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_stream_h +#define PPL_c_stream_h 1 + #include <stdio.h> enum ppl_io_format_line_type { @@ -86,3 +111,5 @@ DECLARE_WRITE_VAL(float, float); DECLARE_WRITE_VAL(double, double); DECLARE_WRITE_VAL(long_double, long double); DECLARE_WRITE_VAL(string, char*); + +#endif /* !defined(PPL_c_stream_h) */

1 0

[GIT] ppl/ppl(formatted_output): Done some cleaning.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: 9b0fdf18dcd89a8e4a3bfadd2ab9dd8388ee8578 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9b0fdf18dcd8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 21:09:10 2009 +0100 Done some cleaning. --- interfaces/C/tests/Makefile.am | 7 +- .../C/tests/{cxxoutput.c => formatted_output.c} | 0 interfaces/C/tests/print_to_buffer.cc | 172 -------------------- 3 files changed, 5 insertions(+), 174 deletions(-) diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index 744a53b..f880ed7 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -49,13 +49,16 @@ libppl_c_tests.a \ @extra_libraries@ NORMAL_TESTS = \ -cxxoutput +formatted_output # # Sources for the tests # -cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.c +formatted_output_SOURCES = \ +formatted_output.c \ +print_to_buffer.h \ +print_to_buffer.c #watchdog1_SRCS = watchdog1.cc diff --git a/interfaces/C/tests/cxxoutput.c b/interfaces/C/tests/formatted_output.c similarity index 100% rename from interfaces/C/tests/cxxoutput.c rename to interfaces/C/tests/formatted_output.c diff --git a/interfaces/C/tests/print_to_buffer.cc b/interfaces/C/tests/print_to_buffer.cc deleted file mode 100644 index d7fcfba..0000000 --- a/interfaces/C/tests/print_to_buffer.cc +++ /dev/null @@ -1,172 +0,0 @@ -/* Declarations of print_ppl_*_t_to_buffer() 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.hh" -#include "ppl_c.h" -#include "print_to_buffer.h" -#include <sstream> -#include <cassert> -#include <iostream> -#include <cstring> -#include <cctype> - -#define DEFINE_PRINT_TO_BUFFER(Type) \ -char* \ -print_ppl_##Type##_t_to_buffer(ppl_##Type##_t p, \ - unsigned indent_depth, \ - unsigned preferred_first_line_length, \ - unsigned preferred_line_length) { \ - using namespace Parma_Polyhedra_Library; \ - return print_to_buffer(*reinterpret_cast<const Type*>(p), \ - indent_depth, \ - preferred_first_line_length, \ - preferred_line_length); \ -} - -namespace { - -size_t -wrap_to_buffer(char *buf, - size_t buf_size, - const char* src, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { - char* dst = buf; - size_t len = 0; - 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) { - i = buf_size - len; - if (i >= 0) { - if (i > (int) indent_depth) - i = indent_depth; - memset(dst, ' ', i); - dst += i; - } - len += indent_depth; - } - i = buf_size - len; - if (i >= 0) { - if (i > split_pos) - i = split_pos; - memcpy(dst, src, i); - dst += i; - } - src += split_pos; - len += split_pos; - if (isspace(*src)) - ++src; - while (*src == ' ') - ++src; - if (*src == '\0') - break; - if (len < buf_size) - *dst++ = '\n'; - ++len; - } - if (len < buf_size) - *dst++ = '\0'; - ++len; - return len; -} - -template <typename T> -char* -print_to_buffer(const T& o, - unsigned indent_depth, - unsigned preferred_first_line_length, - unsigned preferred_line_length) { - using namespace Parma_Polyhedra_Library::IO_Operators; - std::ostringstream s; - s << o; - std::string str = s.str(); - const char* c_str = str.c_str(); - size_t buf_size = wrap_to_buffer(0, 0, c_str, - indent_depth, - preferred_first_line_length, - preferred_line_length); - char* buf = (char*) malloc(buf_size); - if (buf != 0) - wrap_to_buffer(buf, buf_size, c_str, - indent_depth, - preferred_first_line_length, - preferred_line_length); - return buf; -} - -} // namespace - -DEFINE_PRINT_TO_BUFFER(Coefficient) - -DEFINE_PRINT_TO_BUFFER(Linear_Expression) - -DEFINE_PRINT_TO_BUFFER(Constraint) - -DEFINE_PRINT_TO_BUFFER(Constraint_System) - -DEFINE_PRINT_TO_BUFFER(Generator) - -DEFINE_PRINT_TO_BUFFER(Generator_System) - -DEFINE_PRINT_TO_BUFFER(Congruence) - -DEFINE_PRINT_TO_BUFFER(Congruence_System) - -DEFINE_PRINT_TO_BUFFER(Grid_Generator) - -DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) - -DEFINE_PRINT_TO_BUFFER(MIP_Problem)

1 0

[GIT] ppl/ppl(formatted_output): Started the installation of the new formatted output machinery.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: 52f81f97569aa58d4aa87af0a042d9741c5c515d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52f81f97569a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 20:54:14 2009 +0100 Started the installation of the new formatted output machinery. --- interfaces/C/Makefile.am | 4 +- interfaces/C/ppl_c_header.h | 2 + interfaces/C/tests/Makefile.am | 2 +- interfaces/C/tests/print_to_buffer.c | 98 ++++++++++++++++++++++++++++++++++ interfaces/C/tests/print_to_buffer.h | 11 ++-- src/c_stream.h | 27 +++++++++ 6 files changed, 136 insertions(+), 8 deletions(-) diff --git a/interfaces/C/Makefile.am b/interfaces/C/Makefile.am index cffb11e..e1db90f 100644 --- a/interfaces/C/Makefile.am +++ b/interfaces/C/Makefile.am @@ -73,9 +73,9 @@ LIBPPL_C_LT_CURRENT = 2 LIBPPL_C_LT_REVISION = 0 LIBPPL_C_LT_AGE = 0 -ppl_c.h: ppl_c_header.h ppl_c_version.h ppl_c_domains.h Makefile $(top_builddir)/utils/build_header +ppl_c.h: ppl_c_header.h ppl_c_version.h ppl_c_domains.h $(top_srcdir)/src/c_stream.h Makefile $(top_builddir)/utils/build_header $(top_builddir)/utils/build_header \ - -I $(top_builddir)/interfaces/C \ + -I $(top_builddir)/interfaces/C -I $(top_srcdir)/src \ $(top_srcdir)/interfaces/C/ppl_c_header.h >$@ BUILT_SOURCES = \ diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 8dd87d9..6f96cab 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2463,4 +2463,6 @@ PPL_DECLARE_AND_DOCUMENT_IO_FUNCTIONS(MIP_Problem) #undef PPL_DECLARE_AND_DOCUMENT_ASCII_DUMP_LOAD_FUNCTIONS #undef PPL_DECLARE_AND_DOCUMENT_IO_FUNCTIONS +#include "c_stream.h" + #endif /* !defined(PPL_ppl_c_h) */ diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index a5260c0..744a53b 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -55,7 +55,7 @@ cxxoutput # Sources for the tests # -cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.cc +cxxoutput_SOURCES = cxxoutput.c print_to_buffer.h print_to_buffer.c #watchdog1_SRCS = watchdog1.cc diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c new file mode 100644 index 0000000..cafd0e5 --- /dev/null +++ b/interfaces/C/tests/print_to_buffer.c @@ -0,0 +1,98 @@ +/* Declarations of print_ppl_*_t_to_buffer() 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_c.h" +#include "print_to_buffer.h" +#include <malloc.h> +#include <string.h> + +#define DEFINE_PRINT_TO_BUFFER(Type) \ +char* \ +print_##Name##_to_buffer(##Type p, \ + unsigned indent_depth, \ + unsigned pfll, \ + unsigned pll) { \ + char in[indent_depth + 1]; \ + memset(in, ' ', indent_depth); \ + in[indent_depth] = '\0'; \ + struct ppl_io_format_settings settings = { \ + 0, /* tr_in */ \ + 0, /* tr_out */ \ + "\n", /* paragraph_end */ \ + { /* wrap points */ \ + { 0, "," }, /* before, after */ \ + { " ", 0 } /* before, aftet */ \ + }, \ + " ", /* strip_wrap */ \ + 0, /* top */ \ + 0, /* bottom */ \ + { \ + /* length, left, right, alignment, fill_char */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ + { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ + { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ + { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ + { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ + { pfll, "", "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ + { pll, in, "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ + } \ + }; \ + struct ppl_io_ostream* target = ppl_io_ostream_buffer_new(); \ + struct ppl_io_ostream* stream = ppl_io_ostream_format_new(target, &settings); \ + ppl_io_write_##NAME(stream, object); \ + ppl_io_ostream_delete(stream); \ + char *buf; \ + ppl_io_ostream_buffer_get(target, &buf); \ + ppl_io_ostream_delete(target); \ + return buf; \ +} + +DEFINE_PRINT_TO_BUFFER(string, char); + +#if 0 +DEFINE_PRINT_TO_BUFFER(Coefficient) + +DEFINE_PRINT_TO_BUFFER(Linear_Expression) + +DEFINE_PRINT_TO_BUFFER(Constraint) + +DEFINE_PRINT_TO_BUFFER(Constraint_System) + +DEFINE_PRINT_TO_BUFFER(Generator) + +DEFINE_PRINT_TO_BUFFER(Generator_System) + +DEFINE_PRINT_TO_BUFFER(Congruence) + +DEFINE_PRINT_TO_BUFFER(Congruence_System) + +DEFINE_PRINT_TO_BUFFER(Grid_Generator) + +DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) + +DEFINE_PRINT_TO_BUFFER(MIP_Problem) +#endif diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index 1e8f9ef..83e57f3 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -33,11 +33,12 @@ site: http://www.cs.unipr.it/ppl/ . */ `preferred_first_line_length' and `preferred_line_length', respectively. */ -#define DECLARE_PRINT_TO_BUFFER(Type) \ -char* print_ppl_##Type##_t_to_buffer(ppl_##Type##_t p, \ - unsigned indent_depth, \ - unsigned preferred_first_line_length, \ - unsigned preferred_line_length); +#define DECLARE_PRINT_TO_BUFFER(Name, Type) \ +char* \ +print_##Name##_to_buffer(##Type p, \ + unsigned indent_depth, \ + unsigned preferred_first_line_length, \ + unsigned preferred_line_length); #ifdef __cplusplus extern "C" { diff --git a/src/c_stream.h b/src/c_stream.h index ccde3af..23ca3ff 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -1,3 +1,28 @@ +/* Declarations for the formmatted output facility. + 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_stream_h +#define PPL_c_stream_h 1 + #include <stdio.h> enum ppl_io_format_line_type { @@ -86,3 +111,5 @@ DECLARE_WRITE_VAL(float, float); DECLARE_WRITE_VAL(double, double); DECLARE_WRITE_VAL(long_double, long double); DECLARE_WRITE_VAL(string, char*); + +#endif /* !defined(PPL_c_stream_h) */

1 0

[GIT] ppl/ppl(formatted_output): Better name.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: e9f3b884103435828dcb0f95265b394cedf735d2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9f3b8841034… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 19:52:37 2009 +0100 Better name. --- src/c_stream.cc | 4 ++-- src/c_stream.h | 4 ++-- src/c_streambuf_format.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c_stream.cc b/src/c_stream.cc index 0c25bbb..6b3b20b 100644 --- a/src/c_stream.cc +++ b/src/c_stream.cc @@ -38,8 +38,8 @@ ppl_io_format_settings ppl_io_format_default_settings = { { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_NEXT + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT diff --git a/src/c_stream.h b/src/c_stream.h index d54d532..ccde3af 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -5,8 +5,8 @@ enum ppl_io_format_line_type { PPL_IO_FORMAT_LINE_FIRSTLAST, PPL_IO_FORMAT_LINE_NEXT, PPL_IO_FORMAT_LINE_LAST, - PPL_IO_FORMAT_LINE_FORCED_FIRST, - PPL_IO_FORMAT_LINE_FORCED_NEXT, + PPL_IO_FORMAT_LINE_CHOPPED_FIRST, + PPL_IO_FORMAT_LINE_CHOPPED_NEXT, PPL_IO_FORMAT_LINE_LONGER_FIRST, PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST, PPL_IO_FORMAT_LINE_LONGER_NEXT, diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc index 96b9a64..368a494 100644 --- a/src/c_streambuf_format.cc +++ b/src/c_streambuf_format.cc @@ -89,7 +89,7 @@ size_t c_streambuf_format::cb_write(const char *buf, size_t size) { } continue; } - type = first ? PPL_IO_FORMAT_LINE_FORCED_FIRST : PPL_IO_FORMAT_LINE_FORCED_NEXT; + type = first ? PPL_IO_FORMAT_LINE_CHOPPED_FIRST : PPL_IO_FORMAT_LINE_CHOPPED_NEXT; unsigned int limit = len; unsigned int max_len = settings->lines[type].length; if (max_len > 0 && limit > max_len + 1) @@ -133,7 +133,7 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma switch (type) { case PPL_IO_FORMAT_LINE_FIRST: case PPL_IO_FORMAT_LINE_FIRSTLAST: - case PPL_IO_FORMAT_LINE_FORCED_FIRST: + case PPL_IO_FORMAT_LINE_CHOPPED_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST: case PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST:

1 0

[GIT] ppl/ppl(formatted_output): Better name.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: formatted_output Commit: e9f3b884103435828dcb0f95265b394cedf735d2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9f3b8841034… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 19:52:37 2009 +0100 Better name. --- src/c_stream.cc | 4 ++-- src/c_stream.h | 4 ++-- src/c_streambuf_format.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c_stream.cc b/src/c_stream.cc index 0c25bbb..6b3b20b 100644 --- a/src/c_stream.cc +++ b/src/c_stream.cc @@ -38,8 +38,8 @@ ppl_io_format_settings ppl_io_format_default_settings = { { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_NEXT + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT diff --git a/src/c_stream.h b/src/c_stream.h index d54d532..ccde3af 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -5,8 +5,8 @@ enum ppl_io_format_line_type { PPL_IO_FORMAT_LINE_FIRSTLAST, PPL_IO_FORMAT_LINE_NEXT, PPL_IO_FORMAT_LINE_LAST, - PPL_IO_FORMAT_LINE_FORCED_FIRST, - PPL_IO_FORMAT_LINE_FORCED_NEXT, + PPL_IO_FORMAT_LINE_CHOPPED_FIRST, + PPL_IO_FORMAT_LINE_CHOPPED_NEXT, PPL_IO_FORMAT_LINE_LONGER_FIRST, PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST, PPL_IO_FORMAT_LINE_LONGER_NEXT, diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc index 96b9a64..368a494 100644 --- a/src/c_streambuf_format.cc +++ b/src/c_streambuf_format.cc @@ -89,7 +89,7 @@ size_t c_streambuf_format::cb_write(const char *buf, size_t size) { } continue; } - type = first ? PPL_IO_FORMAT_LINE_FORCED_FIRST : PPL_IO_FORMAT_LINE_FORCED_NEXT; + type = first ? PPL_IO_FORMAT_LINE_CHOPPED_FIRST : PPL_IO_FORMAT_LINE_CHOPPED_NEXT; unsigned int limit = len; unsigned int max_len = settings->lines[type].length; if (max_len > 0 && limit > max_len + 1) @@ -133,7 +133,7 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma switch (type) { case PPL_IO_FORMAT_LINE_FIRST: case PPL_IO_FORMAT_LINE_FIRSTLAST: - case PPL_IO_FORMAT_LINE_FORCED_FIRST: + case PPL_IO_FORMAT_LINE_CHOPPED_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST: case PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST:

1 0

[GIT] ppl/ppl(master): Better name.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: e9f3b884103435828dcb0f95265b394cedf735d2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9f3b8841034… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 19:52:37 2009 +0100 Better name. --- src/c_stream.cc | 4 ++-- src/c_stream.h | 4 ++-- src/c_streambuf_format.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c_stream.cc b/src/c_stream.cc index 0c25bbb..6b3b20b 100644 --- a/src/c_stream.cc +++ b/src/c_stream.cc @@ -38,8 +38,8 @@ ppl_io_format_settings ppl_io_format_default_settings = { { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_NEXT + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST + { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT diff --git a/src/c_stream.h b/src/c_stream.h index d54d532..ccde3af 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -5,8 +5,8 @@ enum ppl_io_format_line_type { PPL_IO_FORMAT_LINE_FIRSTLAST, PPL_IO_FORMAT_LINE_NEXT, PPL_IO_FORMAT_LINE_LAST, - PPL_IO_FORMAT_LINE_FORCED_FIRST, - PPL_IO_FORMAT_LINE_FORCED_NEXT, + PPL_IO_FORMAT_LINE_CHOPPED_FIRST, + PPL_IO_FORMAT_LINE_CHOPPED_NEXT, PPL_IO_FORMAT_LINE_LONGER_FIRST, PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST, PPL_IO_FORMAT_LINE_LONGER_NEXT, diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc index 96b9a64..368a494 100644 --- a/src/c_streambuf_format.cc +++ b/src/c_streambuf_format.cc @@ -89,7 +89,7 @@ size_t c_streambuf_format::cb_write(const char *buf, size_t size) { } continue; } - type = first ? PPL_IO_FORMAT_LINE_FORCED_FIRST : PPL_IO_FORMAT_LINE_FORCED_NEXT; + type = first ? PPL_IO_FORMAT_LINE_CHOPPED_FIRST : PPL_IO_FORMAT_LINE_CHOPPED_NEXT; unsigned int limit = len; unsigned int max_len = settings->lines[type].length; if (max_len > 0 && limit > max_len + 1) @@ -133,7 +133,7 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma switch (type) { case PPL_IO_FORMAT_LINE_FIRST: case PPL_IO_FORMAT_LINE_FIRSTLAST: - case PPL_IO_FORMAT_LINE_FORCED_FIRST: + case PPL_IO_FORMAT_LINE_CHOPPED_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRST: case PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST: case PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST:

1 0