isl_set_gist: make context argument an isl_set for consistency

diff --git a/include/isl_map.h b/include/isl_map.h
index 1d6ab7d..a218fca 100644 (file)
--- a/include/isl_map.h
+++ b/include/isl_map.h
@@ -365,6 +365,8 @@ int isl_map_fast_is_fixed(struct isl_map *map,
 __isl_give isl_basic_map *isl_basic_map_gist(__isl_take isl_basic_map *bmap,
        __isl_take isl_basic_map *context);
 __isl_give isl_map *isl_map_gist(__isl_take isl_map *map,
+       __isl_take isl_map *context);
+__isl_give isl_map *isl_map_gist_basic_map(__isl_take isl_map *map,
        __isl_take isl_basic_map *context);
 
 __isl_give isl_map *isl_map_coalesce(__isl_take isl_map *map);

diff --git a/include/isl_set.h b/include/isl_set.h
index 79b1e84..8a8fc48 100644 (file)
--- a/include/isl_set.h
+++ b/include/isl_set.h
@@ -291,8 +291,10 @@ int isl_set_dim_is_bounded(__isl_keep isl_set *set,
 
 struct isl_basic_set *isl_basic_set_gist(struct isl_basic_set *bset,
                                                struct isl_basic_set *context);
-struct isl_set *isl_set_gist(struct isl_set *set,
-       struct isl_basic_set *context);
+__isl_give isl_set *isl_set_gist_basic_set(__isl_take isl_set *set,
+       __isl_take isl_basic_set *context);
+__isl_give isl_set *isl_set_gist(__isl_take isl_set *set,
+       __isl_take isl_set *context);
 int isl_basic_set_dim_residue_class(struct isl_basic_set *bset,
        int pos, isl_int *modulo, isl_int *residue);
 int isl_set_dim_residue_class(struct isl_set *set,

diff --git a/isl_map_simplify.c b/isl_map_simplify.c
index d751240..799caa7 100644 (file)
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
@@ -1740,7 +1740,8 @@ error:
 /*
  * Assumes context has no implicit divs.
  */
-struct isl_map *isl_map_gist(struct isl_map *map, struct isl_basic_map *context)
+__isl_give isl_map *isl_map_gist_basic_map(__isl_take isl_map *map,
+       __isl_take isl_basic_map *context)
 {
        int i;
 
@@ -1781,6 +1782,12 @@ error:
        return NULL;
 }
 
+__isl_give isl_map *isl_map_gist(__isl_take isl_map *map,
+       __isl_take isl_map *context)
+{
+       return isl_map_gist_basic_map(map, isl_map_convex_hull(context));
+}
+
 struct isl_basic_set *isl_basic_set_gist(struct isl_basic_set *bset,
                                                struct isl_basic_set *context)
 {
@@ -1788,12 +1795,20 @@ struct isl_basic_set *isl_basic_set_gist(struct isl_basic_set *bset,
                (struct isl_basic_map *)bset, (struct isl_basic_map *)context);
 }
 
-struct isl_set *isl_set_gist(struct isl_set *set, struct isl_basic_set *context)
+__isl_give isl_set *isl_set_gist_basic_set(__isl_take isl_set *set,
+       __isl_take isl_basic_set *context)
 {
-       return (struct isl_set *)isl_map_gist((struct isl_map *)set,
+       return (struct isl_set *)isl_map_gist_basic_map((struct isl_map *)set,
                                        (struct isl_basic_map *)context);
 }
 
+__isl_give isl_set *isl_set_gist(__isl_take isl_set *set,
+       __isl_take isl_set *context)
+{
+       return (struct isl_set *)isl_map_gist((struct isl_map *)set,
+                                       (struct isl_map *)context);
+}
+
 /* Quick check to see if two basic maps are disjoint.
  * In particular, we reduce the equalities and inequalities of
  * one basic map in the context of the equalities of the other

diff --git a/isl_pw_templ.c b/isl_pw_templ.c
index 6dab41a..d864c3c 100644 (file)
--- a/isl_pw_templ.c
+++ b/isl_pw_templ.c
@@ -345,7 +345,7 @@ __isl_give PW *FN(PW,gist)(__isl_take PW *pw, __isl_take isl_set *context)
                goto error;
 
        for (i = 0; i < pw->n; ++i) {
-               pw->p[i].set = isl_set_gist(pw->p[i].set,
+               pw->p[i].set = isl_set_gist_basic_set(pw->p[i].set,
                                                isl_basic_set_copy(hull));
                if (!pw->p[i].set)
                        goto error;