add isl_pw_qpolynomial_set_dim_name

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

diff --git a/doc/user.pod b/doc/user.pod
index 996762b..61f661b 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -1725,6 +1725,18 @@ The output format of the printer
 needs to be set to either C<ISL_FORMAT_ISL> or C<ISL_FORMAT_C>.
 For C<isl_printer_print_union_pw_qpolynomial>, only C<ISL_FORMAT_ISL>
 is supported.
+In case of printing in C<ISL_FORMAT_C>, the user may want
+to set the names of all dimensions
+
+       __isl_give isl_qpolynomial *isl_qpolynomial_set_dim_name(
+               __isl_take isl_qpolynomial *qp,
+               enum isl_dim_type type, unsigned pos,
+               const char *s);
+       __isl_give isl_pw_qpolynomial *
+       isl_pw_qpolynomial_set_dim_name(
+               __isl_take isl_pw_qpolynomial *pwqp,
+               enum isl_dim_type type, unsigned pos,
+               const char *s);
 
 =head3 Creating New (Piecewise) Quasipolynomials
 

diff --git a/include/isl_polynomial.h b/include/isl_polynomial.h
index 4537c87..ba39043 100644 (file)
--- a/include/isl_polynomial.h
+++ b/include/isl_polynomial.h
@@ -26,6 +26,10 @@ unsigned isl_qpolynomial_dim(__isl_keep isl_qpolynomial *qp,
 int isl_qpolynomial_involves_dims(__isl_keep isl_qpolynomial *qp,
        enum isl_dim_type type, unsigned first, unsigned n);
 
+__isl_give isl_qpolynomial *isl_qpolynomial_set_dim_name(
+       __isl_take isl_qpolynomial *qp,
+       enum isl_dim_type type, unsigned pos, const char *s);
+
 __isl_give isl_qpolynomial *isl_qpolynomial_zero(__isl_take isl_dim *dim);
 __isl_give isl_qpolynomial *isl_qpolynomial_one(__isl_take isl_dim *dim);
 __isl_give isl_qpolynomial *isl_qpolynomial_infty(__isl_take isl_dim *dim);
@@ -138,6 +142,10 @@ int isl_pw_qpolynomial_involves_dims(__isl_keep isl_pw_qpolynomial *pwqp,
 int isl_pw_qpolynomial_has_equal_dim(__isl_keep isl_pw_qpolynomial *pwqp1,
        __isl_keep isl_pw_qpolynomial *pwqp2);
 
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_set_dim_name(
+       __isl_take isl_pw_qpolynomial *pwqp,
+       enum isl_dim_type type, unsigned pos, const char *s);
+
 __isl_give isl_set *isl_pw_qpolynomial_domain(__isl_take isl_pw_qpolynomial *pwqp);
 __isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_intersect_domain(
        __isl_take isl_pw_qpolynomial *pwpq, __isl_take isl_set *set);

diff --git a/isl_fold.c b/isl_fold.c
index fb841f5..2f37054 100644 (file)
--- a/isl_fold.c
+++ b/isl_fold.c
@@ -89,6 +89,32 @@ int isl_qpolynomial_fold_involves_dims(__isl_keep isl_qpolynomial_fold *fold,
        return 0;
 }
 
+__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_set_dim_name(
+       __isl_take isl_qpolynomial_fold *fold,
+       enum isl_dim_type type, unsigned pos, const char *s)
+{
+       int i;
+
+       fold = isl_qpolynomial_fold_cow(fold);
+       if (!fold)
+               return NULL;
+       fold->dim = isl_dim_set_name(fold->dim, type, pos, s);
+       if (!fold->dim)
+               goto error;
+
+       for (i = 0; i < fold->n; ++i) {
+               fold->qp[i] = isl_qpolynomial_set_dim_name(fold->qp[i],
+                                                           type, pos, s);
+               if (!fold->qp[i])
+                       goto error;
+       }
+
+       return fold;
+error:
+       isl_qpolynomial_fold_free(fold);
+       return NULL;
+}
+
 __isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_drop_dims(
        __isl_take isl_qpolynomial_fold *fold,
        enum isl_dim_type type, unsigned first, unsigned n)

diff --git a/isl_polynomial.c b/isl_polynomial.c
index 180a89d..b9b98e1 100644 (file)
--- a/isl_polynomial.c
+++ b/isl_polynomial.c
@@ -1816,6 +1816,22 @@ error:
        return NULL;
 }
 
+__isl_give isl_qpolynomial *isl_qpolynomial_set_dim_name(
+       __isl_take isl_qpolynomial *qp,
+       enum isl_dim_type type, unsigned pos, const char *s)
+{
+       qp = isl_qpolynomial_cow(qp);
+       if (!qp)
+               return NULL;
+       qp->dim = isl_dim_set_name(qp->dim, type, pos, s);
+       if (!qp->dim)
+               goto error;
+       return qp;
+error:
+       isl_qpolynomial_free(qp);
+       return NULL;
+}
+
 __isl_give isl_qpolynomial *isl_qpolynomial_drop_dims(
        __isl_take isl_qpolynomial *qp,
        enum isl_dim_type type, unsigned first, unsigned n)

diff --git a/isl_pw_templ.c b/isl_pw_templ.c
index fb1f626..a56da74 100644 (file)
--- a/isl_pw_templ.c
+++ b/isl_pw_templ.c
@@ -482,6 +482,34 @@ int FN(PW,involves_dims)(__isl_keep PW *pw, enum isl_dim_type type,
        return 0;
 }
 
+__isl_give PW *FN(PW,set_dim_name)(__isl_take PW *pw,
+       enum isl_dim_type type, unsigned pos, const char *s)
+{
+       int i;
+
+       pw = FN(PW,cow)(pw);
+       if (!pw)
+               return NULL;
+
+       pw->dim = isl_dim_set_name(pw->dim, type, pos, s);
+       if (!pw->dim)
+               goto error;
+
+       for (i = 0; i < pw->n; ++i) {
+               pw->p[i].set = isl_set_set_dim_name(pw->p[i].set, type, pos, s);
+               if (!pw->p[i].set)
+                       goto error;
+               pw->p[i].FIELD = FN(EL,set_dim_name)(pw->p[i].FIELD, type, pos, s);
+               if (!pw->p[i].FIELD)
+                       goto error;
+       }
+
+       return pw;
+error:
+       FN(PW,free)(pw);
+       return NULL;
+}
+
 __isl_give PW *FN(PW,drop_dims)(__isl_take PW *pw,
        enum isl_dim_type type, unsigned first, unsigned n)
 {