add isl_space_has_dim_name

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

diff --git a/isl_space.c b/isl_space.c
index ae68013..6a6b5f5 100644 (file)
--- a/isl_space.c
+++ b/isl_space.c
@@ -434,17 +434,37 @@ error:
        return NULL;
 }
 
-__isl_give isl_space *isl_space_set_dim_id(__isl_take isl_space *dim,
+/* Set the id of the given dimension of "space" to "id".
+ * If the dimension already has an id, then it is replaced.
+ * If the dimension is a parameter, then we need to change it
+ * in the nested spaces (if any) as well.
+ */
+__isl_give isl_space *isl_space_set_dim_id(__isl_take isl_space *space,
        enum isl_dim_type type, unsigned pos, __isl_take isl_id *id)
 {
-       dim = isl_space_cow(dim);
-       if (!dim || !id)
+       space = isl_space_cow(space);
+       if (!space || !id)
                goto error;
-       isl_id_free(get_id(dim, type, pos));
-       return set_id(dim, type, pos, id);
+
+       if (type == isl_dim_param) {
+               int i;
+
+               for (i = 0; i < 2; ++i) {
+                       if (!space->nested[i])
+                               continue;
+                       space->nested[i] =
+                               isl_space_set_dim_id(space->nested[i],
+                                               type, pos, isl_id_copy(id));
+                       if (!space->nested[i])
+                               goto error;
+               }
+       }
+
+       isl_id_free(get_id(space, type, pos));
+       return set_id(space, type, pos, id);
 error:
        isl_id_free(id);
-       isl_space_free(dim);
+       isl_space_free(space);
        return NULL;
 }
 
@@ -517,6 +537,19 @@ error:
        return NULL;
 }
 
+/* Does the given dimension have a name?
+ */
+int isl_space_has_dim_name(__isl_keep isl_space *space,
+       enum isl_dim_type type, unsigned pos)
+{
+       isl_id *id;
+
+       if (!space)
+               return -1;
+       id = get_id(space, type, pos);
+       return id && id->name;
+}
+
 __isl_keep const char *isl_space_get_dim_name(__isl_keep isl_space *dim,
                                 enum isl_dim_type type, unsigned pos)
 {
@@ -1067,6 +1100,24 @@ error:
        return NULL;
 }
 
+__isl_give isl_space *isl_space_map_from_domain_and_range(
+       __isl_take isl_space *domain, __isl_take isl_space *range)
+{
+       if (!domain || !range)
+               goto error;
+       if (!isl_space_is_set(domain))
+               isl_die(isl_space_get_ctx(domain), isl_error_invalid,
+                       "domain is not a set space", goto error);
+       if (!isl_space_is_set(range))
+               isl_die(isl_space_get_ctx(range), isl_error_invalid,
+                       "range is not a set space", goto error);
+       return isl_space_join(isl_space_reverse(domain), range);
+error:
+       isl_space_free(domain);
+       isl_space_free(range);
+       return NULL;
+}
+
 static __isl_give isl_space *set_ids(__isl_take isl_space *dim,
        enum isl_dim_type type,
        unsigned first, unsigned n, __isl_take isl_id **ids)