merge isl_*_dump functions

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

diff --git a/Makefile.am b/Makefile.am
index 9115095..84ac5aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,6 +102,7 @@ libisl_la_SOURCES = \
        isl_polynomial.c \
        isl_printer_private.h \
        isl_printer.c \
+       print.c \
        isl_range.c \
        isl_range.h \
        isl_reordering.c \
@@ -231,6 +232,7 @@ EXTRA_DIST = \
        basis_reduction_templ.c \
        isl_list_templ.c \
        isl_list_templ.h \
+       print_templ.c \
        isl_pw_templ.c \
        isl_union_templ.c \
        isl.py \

diff --git a/isl_band.c b/isl_band.c
index e4fbf93..6c3e8a9 100644 (file)
--- a/isl_band.c
+++ b/isl_band.c
@@ -186,17 +186,3 @@ __isl_give isl_printer *isl_printer_print_band(__isl_take isl_printer *p,
 
        return p;
 }
-
-void isl_band_dump(__isl_keep isl_band *band)
-{
-       isl_printer *printer;
-
-       if (!band)
-               return;
-
-       printer = isl_printer_to_file(isl_band_get_ctx(band), stderr);
-       printer = isl_printer_print_band(printer, band);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}

diff --git a/isl_id.c b/isl_id.c
index 81ed8a0..0bb3677 100644 (file)
--- a/isl_id.c
+++ b/isl_id.c
@@ -150,17 +150,3 @@ error:
        isl_printer_free(p);
        return NULL;
 }
-
-void isl_id_dump(__isl_keep isl_id *id)
-{
-       isl_printer *printer;
-
-       if (!id)
-               return;
-
-       printer = isl_printer_to_file(isl_id_get_ctx(id), stderr);
-       printer = isl_printer_print_id(printer, id);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}

diff --git a/isl_output.c b/isl_output.c
index ec2d664..4289096 100644 (file)
--- a/isl_output.c
+++ b/isl_output.c
@@ -1166,179 +1166,6 @@ void isl_map_print(__isl_keep isl_map *map, FILE *out, int indent,
        isl_printer_free(printer);
 }
 
-void isl_basic_map_dump(__isl_keep isl_basic_map *bmap)
-{
-       isl_printer *printer;
-
-       if (!bmap)
-               return;
-
-       printer = isl_printer_to_file(isl_basic_map_get_ctx(bmap), stderr);
-       printer = isl_printer_print_basic_map(printer, bmap);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_basic_set_dump(__isl_keep isl_basic_set *bset)
-{
-       isl_printer *printer;
-
-       if (!bset)
-               return;
-
-       printer = isl_printer_to_file(isl_basic_set_get_ctx(bset), stderr);
-       printer = isl_printer_print_basic_set(printer, bset);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_map_dump(__isl_keep isl_map *map)
-{
-       isl_printer *printer;
-
-       if (!map)
-               return;
-
-       printer = isl_printer_to_file(isl_map_get_ctx(map), stderr);
-       printer = isl_printer_print_map(printer, map);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_set_dump(__isl_keep isl_set *set)
-{
-       isl_printer *printer;
-
-       if (!set)
-               return;
-
-       printer = isl_printer_to_file(isl_set_get_ctx(set), stderr);
-       printer = isl_printer_print_set(printer, set);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_union_map_dump(__isl_keep isl_union_map *umap)
-{
-       isl_printer *printer;
-
-       if (!umap)
-               return;
-
-       printer = isl_printer_to_file(isl_union_map_get_ctx(umap), stderr);
-       printer = isl_printer_print_union_map(printer, umap);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_union_set_dump(__isl_keep isl_union_set *uset)
-{
-       isl_printer *printer;
-
-       if (!uset)
-               return;
-
-       printer = isl_printer_to_file(isl_union_set_get_ctx(uset), stderr);
-       printer = isl_printer_print_union_set(printer, uset);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_union_pw_qpolynomial_dump(__isl_keep isl_union_pw_qpolynomial *upwqp)
-{
-       isl_printer *printer;
-
-       if (!upwqp)
-               return;
-
-       printer = isl_printer_to_file(isl_union_pw_qpolynomial_get_ctx(upwqp),
-                                       stderr);
-       printer = isl_printer_print_union_pw_qpolynomial(printer, upwqp);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_qpolynomial_dump(__isl_keep isl_qpolynomial *qp)
-{
-       isl_printer *printer;
-
-       if (!qp)
-               return;
-
-       printer = isl_printer_to_file(isl_qpolynomial_get_ctx(qp), stderr);
-       printer = isl_printer_print_qpolynomial(printer, qp);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_qpolynomial_fold_dump(__isl_keep isl_qpolynomial_fold *fold)
-{
-       isl_printer *printer;
-
-       if (!fold)
-               return;
-
-       printer = isl_printer_to_file(isl_qpolynomial_fold_get_ctx(fold),
-                                       stderr);
-       printer = isl_printer_print_qpolynomial_fold(printer, fold);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_pw_qpolynomial_dump(__isl_keep isl_pw_qpolynomial *pwqp)
-{
-       isl_printer *printer;
-
-       if (!pwqp)
-               return;
-
-       printer = isl_printer_to_file(isl_pw_qpolynomial_get_ctx(pwqp), stderr);
-       printer = isl_printer_print_pw_qpolynomial(printer, pwqp);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_pw_qpolynomial_fold_dump(__isl_keep isl_pw_qpolynomial_fold *pwf)
-{
-       isl_printer *printer;
-
-       if (!pwf)
-               return;
-
-       printer = isl_printer_to_file(
-                       isl_pw_qpolynomial_fold_get_ctx(pwf), stderr);
-       printer = isl_printer_print_pw_qpolynomial_fold(printer, pwf);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
-void isl_union_pw_qpolynomial_fold_dump(
-       __isl_keep isl_union_pw_qpolynomial_fold *upwf)
-{
-       isl_printer *printer;
-
-       if (!upwf)
-               return;
-
-       printer = isl_printer_to_file(
-                       isl_union_pw_qpolynomial_fold_get_ctx(upwf), stderr);
-       printer = isl_printer_print_union_pw_qpolynomial_fold(printer, upwf);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
 static int upoly_rec_n_non_zero(__isl_keep struct isl_upoly_rec *rec)
 {
        int i;
@@ -2106,20 +1933,6 @@ error:
        return NULL;
 }
 
-void isl_constraint_dump(__isl_keep isl_constraint *c)
-{
-       isl_printer *printer;
-
-       if (!c)
-               return;
-
-       printer = isl_printer_to_file(isl_constraint_get_ctx(c), stderr);
-       printer = isl_printer_print_constraint(printer, c);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
 __isl_give isl_printer *isl_printer_print_dim(__isl_take isl_printer *p,
        __isl_keep isl_dim *dim)
 {
@@ -2143,20 +1956,6 @@ error:
        return NULL;
 }
 
-void isl_dim_dump(__isl_keep isl_dim *dim)
-{
-       isl_printer *printer;
-
-       if (!dim)
-               return;
-
-       printer = isl_printer_to_file(isl_dim_get_ctx(dim), stderr);
-       printer = isl_printer_print_dim(printer, dim);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
 __isl_give isl_printer *isl_printer_print_local_space(__isl_take isl_printer *p,
        __isl_keep isl_local_space *ls)
 {
@@ -2201,20 +2000,6 @@ error:
        return NULL;
 }
 
-void isl_local_space_dump(__isl_keep isl_local_space *ls)
-{
-       isl_printer *printer;
-
-       if (!ls)
-               return;
-
-       printer = isl_printer_to_file(isl_local_space_get_ctx(ls), stderr);
-       printer = isl_printer_print_local_space(printer, ls);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
 static __isl_give isl_printer *print_aff(__isl_take isl_printer *p,
        __isl_keep isl_aff *aff)
 {
@@ -2256,20 +2041,6 @@ error:
        return NULL;
 }
 
-void isl_aff_dump(__isl_keep isl_aff *aff)
-{
-       isl_printer *printer;
-
-       if (!aff)
-               return;
-
-       printer = isl_printer_to_file(isl_aff_get_ctx(aff), stderr);
-       printer = isl_printer_print_aff(printer, aff);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}
-
 static __isl_give isl_printer *print_pw_aff_isl(__isl_take isl_printer *p,
        __isl_keep isl_pw_aff *pwaff)
 {
@@ -2449,17 +2220,3 @@ error:
        isl_printer_free(p);
        return NULL;
 }
-
-void isl_pw_aff_dump(__isl_keep isl_pw_aff *pwaff)
-{
-       isl_printer *printer;
-
-       if (!pwaff)
-               return;
-
-       printer = isl_printer_to_file(isl_pw_aff_get_ctx(pwaff), stderr);
-       printer = isl_printer_print_pw_aff(printer, pwaff);
-       printer = isl_printer_end_line(printer);
-
-       isl_printer_free(printer);
-}

diff --git a/print.c b/print.c
new file mode 100644 (file)
index 0000000..c0574bb
--- /dev/null
+++ b/print.c
@@ -0,0 +1,71 @@
+#include <isl/ctx.h>
+#include <isl/id.h>
+#include <isl/dim.h>
+#include <isl/local_space.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/union_set.h>
+#include <isl/union_map.h>
+#include <isl/polynomial.h>
+#include <isl/band.h>
+#include <isl/constraint.h>
+#include <isl/aff.h>
+#include <isl/printer.h>
+
+#undef BASE
+#define BASE id
+#include <print_templ.c>
+#undef BASE
+#define BASE dim
+#include <print_templ.c>
+#undef BASE
+#define BASE local_space
+#include <print_templ.c>
+#undef BASE
+#define BASE basic_set
+#include <print_templ.c>
+#undef BASE
+#define BASE basic_map
+#include <print_templ.c>
+#undef BASE
+#define BASE set
+#include <print_templ.c>
+#undef BASE
+#define BASE map
+#include <print_templ.c>
+#undef BASE
+#define BASE union_set
+#include <print_templ.c>
+#undef BASE
+#define BASE union_map
+#include <print_templ.c>
+#undef BASE
+#define BASE qpolynomial
+#include <print_templ.c>
+#undef BASE
+#define BASE qpolynomial_fold
+#include <print_templ.c>
+#undef BASE
+#define BASE pw_qpolynomial
+#include <print_templ.c>
+#undef BASE
+#define BASE pw_qpolynomial_fold
+#include <print_templ.c>
+#undef BASE
+#define BASE union_pw_qpolynomial
+#include <print_templ.c>
+#undef BASE
+#define BASE union_pw_qpolynomial_fold
+#include <print_templ.c>
+#undef BASE
+#define BASE band
+#include <print_templ.c>
+#undef BASE
+#define BASE constraint
+#include <print_templ.c>
+#undef BASE
+#define BASE aff
+#include <print_templ.c>
+#undef BASE
+#define BASE pw_aff
+#include <print_templ.c>

diff --git a/print_templ.c b/print_templ.c
new file mode 100644 (file)
index 0000000..9dd9b86
--- /dev/null
+++ b/print_templ.c
@@ -0,0 +1,18 @@
+#define xCAT(A,B) A ## B
+#define CAT(A,B) xCAT(A,B)
+#undef TYPE
+#define TYPE CAT(isl_,BASE)
+#define xFN(TYPE,NAME) TYPE ## _ ## NAME
+#define FN(TYPE,NAME) xFN(TYPE,NAME)
+
+void FN(TYPE,dump)(__isl_keep TYPE *obj)
+{
+       isl_printer *p;
+
+       if (!obj)
+               return;
+       p = isl_printer_to_file(FN(TYPE,get_ctx)(obj), stderr);
+       p = FN(isl_printer_print,BASE)(p, obj);
+       p = isl_printer_end_line(p);
+       isl_printer_free(p);
+}