add isl_aff_mod_val

[platform/upstream/isl.git] / isl_output.c

diff --git a/isl_output.c b/isl_output.c
index 35c7cd3..a1feb7f 100644 (file)
--- a/isl_output.c
+++ b/isl_output.c
@@ -24,6 +24,7 @@
 #include <isl/constraint.h>
 #include <isl_local_space_private.h>
 #include <isl_aff_private.h>
+#include <isl_ast_build_expr.h>
 
 static const char *s_to[2] = { " -> ", " \\to " };
 static const char *s_and[2] = { " and ", " \\wedge " };
@@ -565,17 +566,6 @@ static __isl_give isl_printer *basic_map_print_omega(
        return p;
 }
 
-static __isl_give isl_printer *isl_basic_map_print_omega(
-       __isl_keep isl_basic_map *bmap, __isl_take isl_printer *p)
-{
-       p = print_omega_parameters(bmap->dim, p);
-
-       p = isl_printer_start_line(p);
-       p = basic_map_print_omega(bmap, p);
-       p = isl_printer_end_line(p);
-       return p;
-}
-
 static __isl_give isl_printer *basic_set_print_omega(
        __isl_keep isl_basic_set *bset, __isl_take isl_printer *p)
 {
@@ -587,31 +577,16 @@ static __isl_give isl_printer *basic_set_print_omega(
        return p;
 }
 
-static __isl_give isl_printer *isl_basic_set_print_omega(
-       __isl_keep isl_basic_set *bset, __isl_take isl_printer *p)
-{
-       p = print_omega_parameters(bset->dim, p);
-
-       p = isl_printer_start_line(p);
-       p = basic_set_print_omega(bset, p);
-       p = isl_printer_end_line(p);
-       return p;
-}
-
 static __isl_give isl_printer *isl_map_print_omega(__isl_keep isl_map *map,
        __isl_take isl_printer *p)
 {
        int i;
 
-       p = print_omega_parameters(map->dim, p);
-
-       p = isl_printer_start_line(p);
        for (i = 0; i < map->n; ++i) {
                if (i)
                        p = isl_printer_print_str(p, " union ");
                p = basic_map_print_omega(map->p[i], p);
        }
-       p = isl_printer_end_line(p);
        return p;
 }
 
@@ -620,15 +595,11 @@ static __isl_give isl_printer *isl_set_print_omega(__isl_keep isl_set *set,
 {
        int i;
 
-       p = print_omega_parameters(set->dim, p);
-
-       p = isl_printer_start_line(p);
        for (i = 0; i < set->n; ++i) {
                if (i)
                        p = isl_printer_print_str(p, " union ");
                p = basic_set_print_omega(set->p[i], p);
        }
-       p = isl_printer_end_line(p);
        return p;
 }
 
@@ -955,7 +926,7 @@ __isl_give isl_printer *isl_printer_print_basic_map(__isl_take isl_printer *p,
        if (p->output_format == ISL_FORMAT_ISL)
                return isl_basic_map_print_isl(bmap, p, 0);
        else if (p->output_format == ISL_FORMAT_OMEGA)
-               return isl_basic_map_print_omega(bmap, p);
+               return basic_map_print_omega(bmap, p);
        isl_assert(bmap->ctx, 0, goto error);
 error:
        isl_printer_free(p);
@@ -995,7 +966,7 @@ __isl_give isl_printer *isl_printer_print_basic_set(__isl_take isl_printer *p,
        else if (p->output_format == ISL_FORMAT_POLYLIB_CONSTRAINTS)
                return bset_print_constraints_polylib(bset, p);
        else if (p->output_format == ISL_FORMAT_OMEGA)
-               return isl_basic_set_print_omega(bset, p);
+               return basic_set_print_omega(bset, p);
        isl_assert(p->ctx, 0, goto error);
 error:
        isl_printer_free(p);
@@ -1709,6 +1680,9 @@ static __isl_give isl_printer *print_set_c(__isl_take isl_printer *p,
 {
        int i;
 
+       if (!set)
+               return isl_printer_free(p);
+
        if (set->n == 0)
                p = isl_printer_print_str(p, "0");
 
@@ -1968,8 +1942,8 @@ error:
        return NULL;
 }
 
-__isl_give isl_printer *isl_printer_print_space(__isl_take isl_printer *p,
-       __isl_keep isl_space *dim)
+static __isl_give isl_printer *isl_printer_print_space_isl(
+       __isl_take isl_printer *p, __isl_keep isl_space *dim)
 {
        if (!dim)
                goto error;
@@ -1992,6 +1966,21 @@ error:
        return NULL;
 }
 
+__isl_give isl_printer *isl_printer_print_space(__isl_take isl_printer *p,
+       __isl_keep isl_space *space)
+{
+       if (!p || !space)
+               return isl_printer_free(p);
+       if (p->output_format == ISL_FORMAT_ISL)
+               return isl_printer_print_space_isl(p, space);
+       else if (p->output_format == ISL_FORMAT_OMEGA)
+               return print_omega_parameters(space, p);
+
+       isl_die(isl_space_get_ctx(space), isl_error_unsupported,
+               "output format not supported for space",
+               return isl_printer_free(p));
+}
+
 __isl_give isl_printer *isl_printer_print_local_space(__isl_take isl_printer *p,
        __isl_keep isl_local_space *ls)
 {
@@ -2211,6 +2200,29 @@ static __isl_give isl_printer *print_aff_c(__isl_take isl_printer *p,
        return p;
 }
 
+/* Print the affine expression "aff" in C format to "p".
+ * The dimension names are taken from "space"
+ * "set" represents the domain of the affine expression.
+ */
+static __isl_give isl_printer *print_aff_on_domain_c(__isl_take isl_printer *p,
+       __isl_keep isl_space *space, __isl_keep isl_aff *aff,
+       __isl_keep isl_set *set)
+{
+       isl_set *u;
+       isl_ast_build *build;
+       isl_ast_expr *expr;
+
+       u = isl_set_universe(isl_space_copy(space));
+       build = isl_ast_build_from_context(u);
+       build = isl_ast_build_restrict(build, isl_set_copy(set));
+       expr = isl_ast_expr_from_aff(isl_aff_copy(aff), build);
+       p = isl_printer_print_ast_expr(p, expr);
+       isl_ast_expr_free(expr);
+       isl_ast_build_free(build);
+
+       return p;
+}
+
 /* In the C format, we cannot express that "pwaff" may be undefined
  * on parts of the domain space.  We therefore assume that the expression
  * will only be evaluated on its definition domain and compute the gist
@@ -2243,14 +2255,17 @@ static __isl_give isl_printer *print_pw_aff_c(__isl_take isl_printer *p,
                isl_set_free(set_i);
 
                p = isl_printer_print_str(p, ") ? (");
-               p = print_aff_c(p, pwaff->p[i].aff);
+               p = print_aff_on_domain_c(p, space,
+                                       pwaff->p[i].aff, pwaff->p[i].set);
                p = isl_printer_print_str(p, ") : ");
        }
 
        isl_set_free(domain);
-       isl_space_free(space);
 
-       return print_aff_c(p, pwaff->p[pwaff->n - 1].aff);
+       p = print_aff_on_domain_c(p, space, pwaff->p[pwaff->n - 1].aff,
+                                       pwaff->p[pwaff->n - 1].set);
+       isl_space_free(space);
+       return p;
 error:
        isl_printer_free(p);
        return NULL;