X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_dim.c;h=914d666b38ee5f0d2c5817bf740dd5c5295b050a;hb=de51a9bc4da5dd3f1f9f57c2362da6f9752c44e0;hp=5a5a821c117c9c815a291d4c4707af33e1a62fc5;hpb=f600853f2f7dd332a98d1a4ca58d30567d36e04a;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_dim.c b/isl_dim.c
index 5a5a821..914d666 100644
--- a/isl_dim.c
+++ b/isl_dim.c
@@ -1,1308 +1,258 @@
-/*
- * Copyright 2008-2009 Katholieke Universiteit Leuven
- * Copyright 2010      INRIA Saclay
- *
- * Use of this software is governed by the GNU LGPLv2.1 license
- *
- * Written by Sven Verdoolaege, K.U.Leuven, Departement
- * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
- * and INRIA Saclay - Ile-de-France, Parc Club Orsay Universite,
- * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France 
- */
+#include <isl/dim.h>
+#include <isl/aff.h>
+#include <isl/map.h>
+#include <isl/set.h>
+#include <isl/polynomial.h>
 
-#include <stdlib.h>
-#include <isl_dim_private.h>
-#include "isl_name.h"
-
-isl_ctx *isl_dim_get_ctx(__isl_keep isl_dim *dim)
+isl_ctx *isl_dim_get_ctx(__isl_keep isl_space *dim)
 {
-	return dim ? dim->ctx : NULL;
+	return isl_space_get_ctx(dim);
 }
 
-struct isl_dim *isl_dim_alloc(struct isl_ctx *ctx,
-			unsigned nparam, unsigned n_in, unsigned n_out)
+__isl_give isl_space *isl_dim_alloc(isl_ctx *ctx,
+	unsigned nparam, unsigned n_in, unsigned n_out)
 {
-	struct isl_dim *dim;
-
-	dim = isl_alloc_type(ctx, struct isl_dim);
-	if (!dim)
-		return NULL;
-
-	dim->ctx = ctx;
-	isl_ctx_ref(ctx);
-	dim->ref = 1;
-	dim->nparam = nparam;
-	dim->n_in = n_in;
-	dim->n_out = n_out;
-
-	dim->tuple_name[0] = NULL;
-	dim->tuple_name[1] = NULL;
-
-	dim->nested[0] = NULL;
-	dim->nested[1] = NULL;
-
-	dim->n_name = 0;
-	dim->names = NULL;
-
-	return dim;
+	return isl_space_alloc(ctx, nparam, n_in, n_out);
 }
-
-struct isl_dim *isl_dim_set_alloc(struct isl_ctx *ctx,
-			unsigned nparam, unsigned dim)
+__isl_give isl_space *isl_dim_set_alloc(isl_ctx *ctx,
+	unsigned nparam, unsigned dim)
 {
-	return isl_dim_alloc(ctx, nparam, 0, dim);
+	return isl_space_set_alloc(ctx, nparam, dim);
 }
-
-static unsigned global_pos(struct isl_dim *dim,
-				 enum isl_dim_type type, unsigned pos)
+__isl_give isl_space *isl_dim_copy(__isl_keep isl_space *dim)
 {
-	struct isl_ctx *ctx = dim->ctx;
-
-	switch (type) {
-	case isl_dim_param:
-		isl_assert(ctx, pos < dim->nparam, return isl_dim_total(dim));
-		return pos;
-	case isl_dim_in:
-		isl_assert(ctx, pos < dim->n_in, return isl_dim_total(dim));
-		return pos + dim->nparam;
-	case isl_dim_out:
-		isl_assert(ctx, pos < dim->n_out, return isl_dim_total(dim));
-		return pos + dim->nparam + dim->n_in;
-	default:
-		isl_assert(ctx, 0, return isl_dim_total(dim));
-	}
-	return isl_dim_total(dim);
+	return isl_space_copy(dim);
 }
-
-/* Extend length of names array to the total number of dimensions.
- */
-static __isl_give isl_dim *extend_names(__isl_take isl_dim *dim)
+void isl_dim_free(__isl_take isl_space *dim)
 {
-	struct isl_name **names;
-	int i;
-
-	if (isl_dim_total(dim) <= dim->n_name)
-		return dim;
-
-	if (!dim->names) {
-		dim->names = isl_calloc_array(dim->ctx,
-				struct isl_name *, isl_dim_total(dim));
-		if (!dim->names)
-			goto error;
-	} else {
-		names = isl_realloc_array(dim->ctx, dim->names,
-				struct isl_name *, isl_dim_total(dim));
-		if (!names)
-			goto error;
-		dim->names = names;
-		for (i = dim->n_name; i < isl_dim_total(dim); ++i)
-			dim->names[i] = NULL;
-	}
-
-	dim->n_name = isl_dim_total(dim);
-
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	isl_space_free(dim);
 }
 
-static struct isl_dim *set_name(struct isl_dim *dim,
-				 enum isl_dim_type type, unsigned pos,
-				 struct isl_name *name)
+unsigned isl_dim_size(__isl_keep isl_space *dim, enum isl_dim_type type)
 {
-	struct isl_ctx *ctx = dim->ctx;
-	dim = isl_dim_cow(dim);
-
-	if (!dim)
-		goto error;
-
-	pos = global_pos(dim, type, pos);
-	if (pos == isl_dim_total(dim))
-		goto error;
-
-	if (pos >= dim->n_name) {
-		if (!name)
-			return dim;
-		dim = extend_names(dim);
-		if (!dim)
-			goto error;
-	}
-
-	dim->names[pos] = name;
-
-	return dim;
-error:
-	isl_name_free(ctx, name);
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_dim(dim, type);
 }
 
-static struct isl_name *get_name(struct isl_dim *dim,
-				 enum isl_dim_type type, unsigned pos)
+__isl_give isl_space *isl_dim_set_dim_id(__isl_take isl_space *dim,
+	enum isl_dim_type type, unsigned pos, __isl_take isl_id *id)
 {
-	if (!dim)
-		return NULL;
-
-	pos = global_pos(dim, type, pos);
-	if (pos == isl_dim_total(dim))
-		return NULL;
-	if (pos >= dim->n_name)
-		return NULL;
-	return dim->names[pos];
+	return isl_space_set_dim_id(dim, type, pos, id);
 }
-
-static unsigned offset(struct isl_dim *dim, enum isl_dim_type type)
-{
-	switch (type) {
-	case isl_dim_param:	return 0;
-	case isl_dim_in:	return dim->nparam;
-	case isl_dim_out:	return dim->nparam + dim->n_in;
-	default:		return 0;
-	}
-}
-
-static unsigned n(struct isl_dim *dim, enum isl_dim_type type)
+int isl_dim_has_dim_id(__isl_keep isl_space *dim,
+	enum isl_dim_type type, unsigned pos)
 {
-	switch (type) {
-	case isl_dim_param:	return dim->nparam;
-	case isl_dim_in:	return dim->n_in;
-	case isl_dim_out:	return dim->n_out;
-	case isl_dim_all:	return dim->nparam + dim->n_in + dim->n_out;
-	default:		return 0;
-	}
+	return isl_space_has_dim_id(dim, type, pos);
 }
-
-unsigned isl_dim_size(struct isl_dim *dim, enum isl_dim_type type)
+__isl_give isl_id *isl_dim_get_dim_id(__isl_keep isl_space *dim,
+	enum isl_dim_type type, unsigned pos)
 {
-	if (!dim)
-		return 0;
-	return n(dim, type);
+	return isl_space_get_dim_id(dim, type, pos);
 }
 
-unsigned isl_dim_offset(__isl_keep isl_dim *dim, enum isl_dim_type type)
+int isl_dim_find_dim_by_id(__isl_keep isl_space *dim,
+	enum isl_dim_type type, __isl_keep isl_id *id)
 {
-	if (!dim)
-		return 0;
-	return offset(dim, type);
+	return isl_space_find_dim_by_id(dim, type, id);
 }
 
-static struct isl_dim *copy_names(struct isl_dim *dst,
-	enum isl_dim_type dst_type, unsigned offset, struct isl_dim *src,
-	enum isl_dim_type src_type)
+__isl_give isl_space *isl_dim_set_tuple_id(__isl_take isl_space *dim,
+	enum isl_dim_type type, __isl_take isl_id *id)
 {
-	int i;
-	struct isl_name *name;
-
-	if (!dst)
-		return NULL;
-
-	for (i = 0; i < n(src, src_type); ++i) {
-		name = get_name(src, src_type, i);
-		if (!name)
-			continue;
-		dst = set_name(dst, dst_type, offset + i,
-					isl_name_copy(dst->ctx, name));
-		if (!dst)
-			return NULL;
-	}
-	return dst;
+	return isl_space_set_tuple_id(dim, type, id);
 }
-
-struct isl_dim *isl_dim_dup(struct isl_dim *dim)
+__isl_give isl_space *isl_dim_reset_tuple_id(__isl_take isl_space *dim,
+	enum isl_dim_type type)
 {
-	struct isl_dim *dup;
-	if (!dim)
-		return NULL;
-	dup = isl_dim_alloc(dim->ctx, dim->nparam, dim->n_in, dim->n_out);
-	if (dim->tuple_name[0] &&
-	    !(dup->tuple_name[0] = isl_name_copy(dim->ctx, dim->tuple_name[0])))
-		goto error;
-	if (dim->tuple_name[1] &&
-	    !(dup->tuple_name[1] = isl_name_copy(dim->ctx, dim->tuple_name[1])))
-		goto error;
-	if (dim->nested[0] && !(dup->nested[0] = isl_dim_copy(dim->nested[0])))
-		goto error;
-	if (dim->nested[1] && !(dup->nested[1] = isl_dim_copy(dim->nested[1])))
-		goto error;
-	if (!dim->names)
-		return dup;
-	dup = copy_names(dup, isl_dim_param, 0, dim, isl_dim_param);
-	dup = copy_names(dup, isl_dim_in, 0, dim, isl_dim_in);
-	dup = copy_names(dup, isl_dim_out, 0, dim, isl_dim_out);
-	return dup;
-error:
-	isl_dim_free(dup);
-	return NULL;
+	return isl_space_reset_tuple_id(dim, type);
 }
-
-struct isl_dim *isl_dim_cow(struct isl_dim *dim)
+int isl_dim_has_tuple_id(__isl_keep isl_space *dim, enum isl_dim_type type)
 {
-	if (!dim)
-		return NULL;
-
-	if (dim->ref == 1)
-		return dim;
-	dim->ref--;
-	return isl_dim_dup(dim);
+	return isl_space_has_tuple_id(dim, type);
 }
-
-struct isl_dim *isl_dim_copy(struct isl_dim *dim)
+__isl_give isl_id *isl_dim_get_tuple_id(__isl_keep isl_space *dim,
+	enum isl_dim_type type)
 {
-	if (!dim)
-		return NULL;
-
-	dim->ref++;
-	return dim;
+	return isl_space_get_tuple_id(dim, type);
 }
 
-void isl_dim_free(struct isl_dim *dim)
+__isl_give isl_space *isl_dim_set_name(__isl_take isl_space *dim,
+	enum isl_dim_type type, unsigned pos, __isl_keep const char *name)
 {
-	int i;
-
-	if (!dim)
-		return;
-
-	if (--dim->ref > 0)
-		return;
-
-	isl_name_free(dim->ctx, dim->tuple_name[0]);
-	isl_name_free(dim->ctx, dim->tuple_name[1]);
-
-	isl_dim_free(dim->nested[0]);
-	isl_dim_free(dim->nested[1]);
-
-	for (i = 0; i < dim->n_name; ++i)
-		isl_name_free(dim->ctx, dim->names[i]);
-	free(dim->names);
-	isl_ctx_deref(dim->ctx);
-	
-	free(dim);
+	return isl_space_set_dim_name(dim, type, pos, name);
 }
-
-static int name_ok(isl_ctx *ctx, const char *s)
+__isl_keep const char *isl_dim_get_name(__isl_keep isl_space *dim,
+	enum isl_dim_type type, unsigned pos)
 {
-	char *p;
-	long dummy;
-
-	dummy = strtol(s, &p, 0);
-	if (p != s)
-		isl_die(ctx, isl_error_invalid, "name looks like a number",
-			return 0);
-
-	return 1;
+	return isl_space_get_dim_name(dim, type, pos);
 }
 
-__isl_give isl_dim *isl_dim_set_tuple_name(__isl_take isl_dim *dim,
+__isl_give isl_space *isl_dim_set_tuple_name(__isl_take isl_space *dim,
 	enum isl_dim_type type, const char *s)
 {
-	struct isl_name *name;
-
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-	if (type != isl_dim_in && type != isl_dim_out)
-		isl_die(dim->ctx, isl_error_invalid,
-			"only input, output and set tuples can have names",
-			goto error);
-	if (!s) {
-		name = NULL;
-	} else {
-		if (!name_ok(dim->ctx, s))
-			goto error;
-		name = isl_name_get(dim->ctx, s);
-		if (!name)
-			goto error;
-	}
-
-	isl_name_free(dim->ctx, dim->tuple_name[type - isl_dim_in]);
-	dim->tuple_name[type - isl_dim_in] = name;
-
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
-}
-
-const char *isl_dim_get_tuple_name(__isl_keep isl_dim *dim,
-	 enum isl_dim_type type)
-{
-	struct isl_name *name;
-	if (!dim)
-		return NULL;
-	if (type != isl_dim_in && type != isl_dim_out)
-		return NULL;
-	name = dim->tuple_name[type - isl_dim_in];
-	return name ? name->name : NULL;
-}
-
-struct isl_dim *isl_dim_set_name(struct isl_dim *dim,
-				 enum isl_dim_type type, unsigned pos,
-				 const char *s)
-{
-	struct isl_name *name;
-
-	if (!dim)
-		return NULL;
-	if (!name_ok(dim->ctx, s))
-		goto error;
-	isl_name_free(dim->ctx, get_name(dim, type, pos));
-	name = isl_name_get(dim->ctx, s);
-	if (!name)
-		goto error;
-	return set_name(dim, type, pos, name);
-error:
-	isl_dim_free(dim);
-	return NULL;
-}
-
-const char *isl_dim_get_name(struct isl_dim *dim,
-				 enum isl_dim_type type, unsigned pos)
-{
-	struct isl_name *name = get_name(dim, type, pos);
-	return name ? name->name : NULL;
+	return isl_space_set_tuple_name(dim, type, s);
 }
-
-static struct isl_name *tuple_name(__isl_keep isl_dim *dim,
-	enum isl_dim_type type)
-{
-	if (!dim)
-		return NULL;
-	if (type == isl_dim_in)
-		return dim->tuple_name[0];
-	if (type == isl_dim_out)
-		return dim->tuple_name[1];
-	return NULL;
-}
-
-static __isl_keep isl_dim *nested(__isl_keep isl_dim *dim,
+const char *isl_dim_get_tuple_name(__isl_keep isl_space *dim,
 	enum isl_dim_type type)
 {
-	if (!dim)
-		return NULL;
-	if (type == isl_dim_in)
-		return dim->nested[0];
-	if (type == isl_dim_out)
-		return dim->nested[1];
-	return NULL;
-}
-
-int isl_dim_tuple_match(__isl_keep isl_dim *dim1, enum isl_dim_type dim1_type,
-			__isl_keep isl_dim *dim2, enum isl_dim_type dim2_type)
-{
-	struct isl_name *name1, *name2;
-	isl_dim *nested1, *nested2;
-
-	if (n(dim1, dim1_type) != n(dim2, dim2_type))
-		return 0;
-	name1 = tuple_name(dim1, dim1_type);
-	name2 = tuple_name(dim2, dim2_type);
-	if (!name1 ^ !name2)
-		return 0;
-	if (name1 && name1->name != name2->name)
-		return 0;
-	nested1 = nested(dim1, dim1_type);
-	nested2 = nested(dim2, dim2_type);
-	if (!nested1 ^ !nested2)
-		return 0;
-	if (nested1 && !isl_dim_equal(nested1, nested2))
-		return 0;
-	return 1;
-}
-
-static int match(struct isl_dim *dim1, enum isl_dim_type dim1_type,
-		struct isl_dim *dim2, enum isl_dim_type dim2_type)
-{
-	int i;
-
-	if (!isl_dim_tuple_match(dim1, dim1_type, dim2, dim2_type))
-		return 0;
-
-	if (!dim1->names && !dim2->names)
-		return 1;
-
-	for (i = 0; i < n(dim1, dim1_type); ++i) {
-		if (get_name(dim1, dim1_type, i) !=
-		    get_name(dim2, dim2_type, i))
-			return 0;
-	}
-	return 1;
-}
-
-int isl_dim_match(struct isl_dim *dim1, enum isl_dim_type dim1_type,
-		struct isl_dim *dim2, enum isl_dim_type dim2_type)
-{
-	return match(dim1, dim1_type, dim2, dim2_type);
-}
-
-static void get_names(struct isl_dim *dim, enum isl_dim_type type,
-	unsigned first, unsigned n, struct isl_name **names)
-{
-	int i;
-
-	for (i = 0; i < n ; ++i)
-		names[i] = get_name(dim, type, first+i);
-}
-
-struct isl_dim *isl_dim_extend(struct isl_dim *dim,
-			unsigned nparam, unsigned n_in, unsigned n_out)
-{
-	struct isl_name **names = NULL;
-
-	if (!dim)
-		return NULL;
-	if (dim->nparam == nparam && dim->n_in == n_in && dim->n_out == n_out)
-		return dim;
-
-	isl_assert(dim->ctx, dim->nparam <= nparam, goto error);
-	isl_assert(dim->ctx, dim->n_in <= n_in, goto error);
-	isl_assert(dim->ctx, dim->n_out <= n_out, goto error);
-
-	dim = isl_dim_cow(dim);
-
-	if (dim->names) {
-		names = isl_calloc_array(dim->ctx, struct isl_name *,
-					 nparam + n_in + n_out);
-		if (!names)
-			goto error;
-		get_names(dim, isl_dim_param, 0, dim->nparam, names);
-		get_names(dim, isl_dim_in, 0, dim->n_in, names + nparam);
-		get_names(dim, isl_dim_out, 0, dim->n_out,
-				names + nparam + n_in);
-		free(dim->names);
-		dim->names = names;
-		dim->n_name = nparam + n_in + n_out;
-	}
-	dim->nparam = nparam;
-	dim->n_in = n_in;
-	dim->n_out = n_out;
-
-	return dim;
-error:
-	free(names);
-	isl_dim_free(dim);
-	return NULL;
-}
-
-struct isl_dim *isl_dim_add(struct isl_dim *dim, enum isl_dim_type type,
-	unsigned n)
-{
-	if (!dim)
-		return NULL;
-	dim = isl_dim_reset(dim, type);
-	switch (type) {
-	case isl_dim_param:
-		dim = isl_dim_extend(dim,
-					dim->nparam + n, dim->n_in, dim->n_out);
-		if (dim && dim->nested[0] &&
-		    !(dim->nested[0] = isl_dim_add(dim->nested[0],
-						    isl_dim_param, n)))
-			goto error;
-		if (dim && dim->nested[1] &&
-		    !(dim->nested[1] = isl_dim_add(dim->nested[1],
-						    isl_dim_param, n)))
-			goto error;
-		return dim;
-	case isl_dim_in:
-		return isl_dim_extend(dim,
-					dim->nparam, dim->n_in + n, dim->n_out);
-	case isl_dim_out:
-		return isl_dim_extend(dim,
-					dim->nparam, dim->n_in, dim->n_out + n);
-	default:
-		isl_die(dim->ctx, isl_error_invalid,
-			"cannot add dimensions of specified type", goto error);
-	}
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_get_tuple_name(dim, type);
 }
 
-static int valid_dim_type(enum isl_dim_type type)
+int isl_dim_is_wrapping(__isl_keep isl_space *dim)
 {
-	switch (type) {
-	case isl_dim_param:
-	case isl_dim_in:
-	case isl_dim_out:
-		return 1;
-	default:
-		return 0;
-	}
+	return isl_space_is_wrapping(dim);
 }
-
-__isl_give isl_dim *isl_dim_insert(__isl_take isl_dim *dim,
-	enum isl_dim_type type, unsigned pos, unsigned n)
+__isl_give isl_space *isl_dim_wrap(__isl_take isl_space *dim)
 {
-	struct isl_name **names = NULL;
-
-	if (!dim)
-		return NULL;
-	if (n == 0)
-		return isl_dim_reset(dim, type);
-
-	if (!valid_dim_type(type))
-		isl_die(dim->ctx, isl_error_invalid,
-			"cannot insert dimensions of specified type",
-			goto error);
-
-	isl_assert(dim->ctx, pos <= isl_dim_size(dim, type), goto error);
-
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-
-	if (dim->names) {
-		enum isl_dim_type t;
-		int off;
-		int s[3];
-		int *size = s - isl_dim_param;
-		names = isl_calloc_array(dim->ctx, struct isl_name *,
-				     dim->nparam + dim->n_in + dim->n_out + n);
-		if (!names)
-			goto error;
-		off = 0;
-		size[isl_dim_param] = dim->nparam;
-		size[isl_dim_in] = dim->n_in;
-		size[isl_dim_out] = dim->n_out;
-		for (t = isl_dim_param; t <= isl_dim_out; ++t) {
-			if (t != type) {
-				get_names(dim, t, 0, size[t], names + off);
-				off += size[t];
-			} else {
-				get_names(dim, t, 0, pos, names + off);
-				off += pos + n;
-				get_names(dim, t, pos, size[t]-pos, names+off);
-				off += size[t] - pos;
-			}
-		}
-		free(dim->names);
-		dim->names = names;
-		dim->n_name = dim->nparam + dim->n_in + dim->n_out + n;
-	}
-	switch (type) {
-	case isl_dim_param:	dim->nparam += n; break;
-	case isl_dim_in:	dim->n_in += n; break;
-	case isl_dim_out:	dim->n_out += n; break;
-	default:		;
-	}
-	dim = isl_dim_reset(dim, type);
-
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
-}
-
-__isl_give isl_dim *isl_dim_move(__isl_take isl_dim *dim,
-	enum isl_dim_type dst_type, unsigned dst_pos,
-	enum isl_dim_type src_type, unsigned src_pos, unsigned n)
-{
-	int i;
-
-	if (!dim)
-		return NULL;
-	if (n == 0)
-		return dim;
-
-	isl_assert(dim->ctx, src_pos + n <= isl_dim_size(dim, src_type),
-		goto error);
-
-	if (dst_type == src_type && dst_pos == src_pos)
-		return dim;
-
-	isl_assert(dim->ctx, dst_type != src_type, goto error);
-
-	dim = isl_dim_reset(dim, src_type);
-	dim = isl_dim_reset(dim, dst_type);
-
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-
-	if (dim->names) {
-		struct isl_name **names;
-		enum isl_dim_type t;
-		int off;
-		int s[3];
-		int *size = s - isl_dim_param;
-		names = isl_calloc_array(dim->ctx, struct isl_name *,
-					 dim->nparam + dim->n_in + dim->n_out);
-		if (!names)
-			goto error;
-		off = 0;
-		size[isl_dim_param] = dim->nparam;
-		size[isl_dim_in] = dim->n_in;
-		size[isl_dim_out] = dim->n_out;
-		for (t = isl_dim_param; t <= isl_dim_out; ++t) {
-			if (t == dst_type) {
-				get_names(dim, t, 0, dst_pos, names + off);
-				off += dst_pos;
-				get_names(dim, src_type, src_pos, n, names+off);
-				off += n;
-				get_names(dim, t, dst_pos, size[t] - dst_pos,
-						names + off);
-				off += size[t] - dst_pos;
-			} else if (t == src_type) {
-				get_names(dim, t, 0, src_pos, names + off);
-				off += src_pos;
-				get_names(dim, t, src_pos + n,
-					    size[t] - src_pos - n, names + off);
-				off += size[t] - src_pos - n;
-			} else {
-				get_names(dim, t, 0, size[t], names + off);
-				off += size[t];
-			}
-		}
-		free(dim->names);
-		dim->names = names;
-		dim->n_name = dim->nparam + dim->n_in + dim->n_out;
-	}
-
-	switch (dst_type) {
-	case isl_dim_param:	dim->nparam += n; break;
-	case isl_dim_in:	dim->n_in += n; break;
-	case isl_dim_out:	dim->n_out += n; break;
-	default:		;
-	}
-
-	switch (src_type) {
-	case isl_dim_param:	dim->nparam -= n; break;
-	case isl_dim_in:	dim->n_in -= n; break;
-	case isl_dim_out:	dim->n_out -= n; break;
-	default:		;
-	}
-
-	if (dst_type != isl_dim_param && src_type != isl_dim_param)
-		return dim;
-
-	for (i = 0; i < 2; ++i) {
-		if (!dim->nested[i])
-			continue;
-		dim->nested[i] = isl_dim_replace(dim->nested[i],
-						 isl_dim_param, dim);
-		if (!dim->nested[i])
-			goto error;
-	}
-
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_wrap(dim);
 }
-
-struct isl_dim *isl_dim_join(struct isl_dim *left, struct isl_dim *right)
+__isl_give isl_space *isl_dim_unwrap(__isl_take isl_space *dim)
 {
-	struct isl_dim *dim;
-
-	if (!left || !right)
-		goto error;
-
-	isl_assert(left->ctx, match(left, isl_dim_param, right, isl_dim_param),
-			goto error);
-	isl_assert(left->ctx,
-		isl_dim_tuple_match(left, isl_dim_out, right, isl_dim_in),
-		goto error);
-
-	dim = isl_dim_alloc(left->ctx, left->nparam, left->n_in, right->n_out);
-	if (!dim)
-		goto error;
-
-	dim = copy_names(dim, isl_dim_param, 0, left, isl_dim_param);
-	dim = copy_names(dim, isl_dim_in, 0, left, isl_dim_in);
-	dim = copy_names(dim, isl_dim_out, 0, right, isl_dim_out);
-
-	if (dim && left->tuple_name[0] &&
-	    !(dim->tuple_name[0] = isl_name_copy(dim->ctx, left->tuple_name[0])))
-		goto error;
-	if (dim && right->tuple_name[1] &&
-	    !(dim->tuple_name[1] = isl_name_copy(dim->ctx, right->tuple_name[1])))
-		goto error;
-	if (dim && left->nested[0] &&
-	    !(dim->nested[0] = isl_dim_copy(left->nested[0])))
-		goto error;
-	if (dim && right->nested[1] &&
-	    !(dim->nested[1] = isl_dim_copy(right->nested[1])))
-		goto error;
-
-	isl_dim_free(left);
-	isl_dim_free(right);
-
-	return dim;
-error:
-	isl_dim_free(left);
-	isl_dim_free(right);
-	return NULL;
+	return isl_space_unwrap(dim);
 }
 
-struct isl_dim *isl_dim_product(struct isl_dim *left, struct isl_dim *right)
+__isl_give isl_space *isl_dim_domain(__isl_take isl_space *dim)
 {
-	isl_dim *dom1, *dom2, *nest1, *nest2;
-
-	if (!left || !right)
-		goto error;
-
-	isl_assert(left->ctx, match(left, isl_dim_param, right, isl_dim_param),
-			goto error);
-
-	dom1 = isl_dim_domain(isl_dim_copy(left));
-	dom2 = isl_dim_domain(isl_dim_copy(right));
-	nest1 = isl_dim_wrap(isl_dim_join(isl_dim_reverse(dom1), dom2));
-
-	dom1 = isl_dim_range(left);
-	dom2 = isl_dim_range(right);
-	nest2 = isl_dim_wrap(isl_dim_join(isl_dim_reverse(dom1), dom2));
-
-	return isl_dim_join(isl_dim_reverse(nest1), nest2);
-error:
-	isl_dim_free(left);
-	isl_dim_free(right);
-	return NULL;
+	return isl_space_domain(dim);
 }
-
-__isl_give isl_dim *isl_dim_range_product(__isl_take isl_dim *left,
-	__isl_take isl_dim *right)
+__isl_give isl_space *isl_dim_from_domain(__isl_take isl_space *dim)
 {
-	isl_dim *dom, *ran1, *ran2, *nest;
-
-	if (!left || !right)
-		goto error;
-
-	isl_assert(left->ctx, match(left, isl_dim_param, right, isl_dim_param),
-			goto error);
-	if (!isl_dim_match(left, isl_dim_in, right, isl_dim_in))
-		isl_die(left->ctx, isl_error_invalid,
-			"domains need to match", goto error);
-
-	dom = isl_dim_domain(isl_dim_copy(left));
-
-	ran1 = isl_dim_range(left);
-	ran2 = isl_dim_range(right);
-	nest = isl_dim_wrap(isl_dim_join(isl_dim_reverse(ran1), ran2));
-
-	return isl_dim_join(isl_dim_reverse(dom), nest);
-error:
-	isl_dim_free(left);
-	isl_dim_free(right);
-	return NULL;
+	return isl_space_from_domain(dim);
 }
-
-__isl_give isl_dim *isl_dim_map_from_set(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_dim_range(__isl_take isl_space *dim)
 {
-	struct isl_name **names = NULL;
-
-	if (!dim)
-		return NULL;
-	isl_assert(dim->ctx, dim->n_in == 0, goto error);
-	if (dim->n_out == 0 && !isl_dim_is_named_or_nested(dim, isl_dim_out))
-		return dim;
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-	if (dim->names) {
-		names = isl_calloc_array(dim->ctx, struct isl_name *,
-					dim->nparam + dim->n_out + dim->n_out);
-		if (!names)
-			goto error;
-		get_names(dim, isl_dim_param, 0, dim->nparam, names);
-		get_names(dim, isl_dim_out, 0, dim->n_out, names + dim->nparam);
-	}
-	dim->n_in = dim->n_out;
-	if (names) {
-		free(dim->names);
-		dim->names = names;
-		dim->n_name = dim->nparam + dim->n_out + dim->n_out;
-		dim = copy_names(dim, isl_dim_out, 0, dim, isl_dim_in);
-	}
-	isl_name_free(dim->ctx, dim->tuple_name[0]);
-	dim->tuple_name[0] = isl_name_copy(dim->ctx, dim->tuple_name[1]);
-	isl_dim_free(dim->nested[0]);
-	dim->nested[0] = isl_dim_copy(dim->nested[1]);
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_range(dim);
 }
-
-static struct isl_dim *set_names(struct isl_dim *dim, enum isl_dim_type type,
-	unsigned first, unsigned n, struct isl_name **names)
+__isl_give isl_space *isl_dim_from_range(__isl_take isl_space *dim)
 {
-	int i;
-
-	for (i = 0; i < n ; ++i)
-		dim = set_name(dim, type, first+i, names[i]);
-
-	return dim;
+	return isl_space_from_range(dim);
 }
-
-struct isl_dim *isl_dim_reverse(struct isl_dim *dim)
+__isl_give isl_space *isl_dim_reverse(__isl_take isl_space *dim)
 {
-	unsigned t;
-	isl_dim *nested;
-	struct isl_name **names = NULL;
-	struct isl_name *name;
-
-	if (!dim)
-		return NULL;
-	if (match(dim, isl_dim_in, dim, isl_dim_out))
-		return dim;
-
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-
-	name = dim->tuple_name[0];
-	dim->tuple_name[0] = dim->tuple_name[1];
-	dim->tuple_name[1] = name;
-
-	nested = dim->nested[0];
-	dim->nested[0] = dim->nested[1];
-	dim->nested[1] = nested;
-
-	if (dim->names) {
-		names = isl_alloc_array(dim->ctx, struct isl_name *,
-					dim->n_in + dim->n_out);
-		if (!names)
-			goto error;
-		get_names(dim, isl_dim_in, 0, dim->n_in, names);
-		get_names(dim, isl_dim_out, 0, dim->n_out, names + dim->n_in);
-	}
-
-	t = dim->n_in;
-	dim->n_in = dim->n_out;
-	dim->n_out = t;
-
-	if (dim->names) {
-		dim = set_names(dim, isl_dim_out, 0, dim->n_out, names);
-		dim = set_names(dim, isl_dim_in, 0, dim->n_in, names + dim->n_out);
-		free(names);
-	}
-
-	return dim;
-error:
-	free(names);
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_reverse(dim);
 }
-
-struct isl_dim *isl_dim_drop(struct isl_dim *dim, enum isl_dim_type type,
-		unsigned first, unsigned num)
+__isl_give isl_space *isl_dim_join(__isl_take isl_space *left,
+	__isl_take isl_space *right)
 {
-	int i;
-
-	if (!dim)
-		return NULL;
-
-	if (num == 0)
-		return isl_dim_reset(dim, type);
-
-	if (!valid_dim_type(type))
-		isl_die(dim->ctx, isl_error_invalid,
-			"cannot drop dimensions of specified type", goto error);
-
-	isl_assert(dim->ctx, first + num <= n(dim, type), goto error);
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		goto error;
-	if (dim->names) {
-		dim = extend_names(dim);
-		if (!dim)
-			goto error;
-		for (i = 0; i < num; ++i)
-			isl_name_free(dim->ctx, get_name(dim, type, first+i));
-		for (i = first+num; i < n(dim, type); ++i)
-			set_name(dim, type, i - num, get_name(dim, type, i));
-		switch (type) {
-		case isl_dim_param:
-			get_names(dim, isl_dim_in, 0, dim->n_in,
-				dim->names + offset(dim, isl_dim_in) - num);
-		case isl_dim_in:
-			get_names(dim, isl_dim_out, 0, dim->n_out,
-				dim->names + offset(dim, isl_dim_out) - num);
-		default:
-			;
-		}
-		dim->n_name -= num;
-	}
-	switch (type) {
-	case isl_dim_param:	dim->nparam -= num; break;
-	case isl_dim_in:	dim->n_in -= num; break;
-	case isl_dim_out:	dim->n_out -= num; break;
-	default:		;
-	}
-	dim = isl_dim_reset(dim, type);
-	if (type == isl_dim_param) {
-		if (dim && dim->nested[0] &&
-		    !(dim->nested[0] = isl_dim_drop(dim->nested[0],
-						    isl_dim_param, first, num)))
-			goto error;
-		if (dim && dim->nested[1] &&
-		    !(dim->nested[1] = isl_dim_drop(dim->nested[1],
-						    isl_dim_param, first, num)))
-			goto error;
-	}
-	return dim;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_space_join(left, right);
 }
-
-struct isl_dim *isl_dim_drop_inputs(struct isl_dim *dim,
-		unsigned first, unsigned n)
+__isl_give isl_space *isl_dim_align_params(__isl_take isl_space *dim1,
+	__isl_take isl_space *dim2)
 {
-	if (!dim)
-		return NULL;
-	return isl_dim_drop(dim, isl_dim_in, first, n);
+	return isl_space_align_params(dim1, dim2);
 }
-
-struct isl_dim *isl_dim_drop_outputs(struct isl_dim *dim,
-		unsigned first, unsigned n)
+__isl_give isl_space *isl_dim_insert(__isl_take isl_space *dim,
+	enum isl_dim_type type, unsigned pos, unsigned n)
 {
-	if (!dim)
-		return NULL;
-	return isl_dim_drop(dim, isl_dim_out, first, n);
+	return isl_space_insert_dims(dim, type, pos, n);
 }
-
-struct isl_dim *isl_dim_domain(struct isl_dim *dim)
+__isl_give isl_space *isl_dim_add(__isl_take isl_space *dim,
+	enum isl_dim_type type, unsigned n)
 {
-	if (!dim)
-		return NULL;
-	dim = isl_dim_drop_outputs(dim, 0, dim->n_out);
-	return isl_dim_reverse(dim);
+	return isl_space_add_dims(dim, type, n);
 }
-
-__isl_give isl_dim *isl_dim_from_domain(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_dim_drop(__isl_take isl_space *dim,
+	enum isl_dim_type type, unsigned first, unsigned n)
 {
-	return isl_dim_reverse(dim);
+	return isl_space_drop_dims(dim, type, first, n);
 }
-
-struct isl_dim *isl_dim_range(struct isl_dim *dim)
+__isl_give isl_space *isl_dim_move(__isl_take isl_space *dim,
+	enum isl_dim_type dst_type, unsigned dst_pos,
+	enum isl_dim_type src_type, unsigned src_pos, unsigned n)
 {
-	if (!dim)
-		return NULL;
-	return isl_dim_drop_inputs(dim, 0, dim->n_in);
+	return isl_space_move_dims(dim, dst_type, dst_pos, src_type, src_pos, n);
 }
-
-__isl_give isl_dim *isl_dim_from_range(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_dim_map_from_set(__isl_take isl_space *dim)
 {
-	return dim;
+	return isl_space_map_from_set(dim);
 }
-
-__isl_give isl_dim *isl_dim_as_set_dim(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_dim_zip(__isl_take isl_space *dim)
 {
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-
-	dim->n_out += dim->n_in;
-	dim->n_in = 0;
-	dim = isl_dim_reset(dim, isl_dim_in);
-	dim = isl_dim_reset(dim, isl_dim_out);
-
-	return dim;
+	return isl_space_zip(dim);
 }
 
-struct isl_dim *isl_dim_underlying(struct isl_dim *dim, unsigned n_div)
+__isl_give isl_local_space *isl_local_space_from_dim(
+	__isl_take isl_space *dim)
 {
-	int i;
-
-	if (!dim)
-		return NULL;
-	if (n_div == 0 &&
-	    dim->nparam == 0 && dim->n_in == 0 && dim->n_name == 0)
-		return isl_dim_reset(isl_dim_reset(dim, isl_dim_in), isl_dim_out);
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-	dim->n_out += dim->nparam + dim->n_in + n_div;
-	dim->nparam = 0;
-	dim->n_in = 0;
-
-	for (i = 0; i < dim->n_name; ++i)
-		isl_name_free(dim->ctx, get_name(dim, isl_dim_out, i));
-	dim->n_name = 0;
-	dim = isl_dim_reset(dim, isl_dim_in);
-	dim = isl_dim_reset(dim, isl_dim_out);
-
-	return dim;
+	return isl_local_space_from_space(dim);
 }
-
-unsigned isl_dim_total(struct isl_dim *dim)
+__isl_give isl_space *isl_local_space_get_dim(
+	__isl_keep isl_local_space *ls)
 {
-	return dim ? dim->nparam + dim->n_in + dim->n_out : 0;
+	return isl_local_space_get_space(ls);
 }
 
-int isl_dim_equal(struct isl_dim *dim1, struct isl_dim *dim2)
+__isl_give isl_space *isl_aff_get_dim(__isl_keep isl_aff *aff)
 {
-	return match(dim1, isl_dim_param, dim2, isl_dim_param) &&
-	       isl_dim_tuple_match(dim1, isl_dim_in, dim2, isl_dim_in) &&
-	       isl_dim_tuple_match(dim1, isl_dim_out, dim2, isl_dim_out);
+	return isl_aff_get_space(aff);
 }
-
-int isl_dim_compatible(struct isl_dim *dim1, struct isl_dim *dim2)
+__isl_give isl_space *isl_pw_aff_get_dim(__isl_keep isl_pw_aff *pwaff)
 {
-	return dim1->nparam == dim2->nparam &&
-	       dim1->n_in + dim1->n_out == dim2->n_in + dim2->n_out;
+	return isl_pw_aff_get_space(pwaff);
 }
 
-static uint32_t isl_hash_dim(uint32_t hash, __isl_keep isl_dim *dim)
+__isl_give isl_space *isl_constraint_get_dim(
+	__isl_keep isl_constraint *constraint)
 {
-	int i;
-	struct isl_name *name;
-
-	if (!dim)
-		return hash;
-
-	hash = isl_hash_builtin(hash, dim->nparam);
-	hash = isl_hash_builtin(hash, dim->n_in);
-	hash = isl_hash_builtin(hash, dim->n_out);
-
-	for (i = 0; i < dim->nparam; ++i) {
-		name = get_name(dim, isl_dim_param, i);
-		hash = isl_hash_name(hash, name);
-	}
-
-	name = tuple_name(dim, isl_dim_in);
-	hash = isl_hash_name(hash, name);
-	name = tuple_name(dim, isl_dim_out);
-	hash = isl_hash_name(hash, name);
-
-	hash = isl_hash_dim(hash, dim->nested[0]);
-	hash = isl_hash_dim(hash, dim->nested[1]);
-
-	return hash;
+	return isl_constraint_get_space(constraint);
 }
 
-uint32_t isl_dim_get_hash(__isl_keep isl_dim *dim)
+__isl_give isl_space *isl_basic_map_get_dim(__isl_keep isl_basic_map *bmap)
 {
-	uint32_t hash;
-
-	if (!dim)
-		return 0;
-
-	hash = isl_hash_init();
-	hash = isl_hash_dim(hash, dim);
-
-	return hash;
+	return isl_basic_map_get_space(bmap);
 }
-
-int isl_dim_is_wrapping(__isl_keep isl_dim *dim)
+__isl_give isl_space *isl_map_get_dim(__isl_keep isl_map *map)
 {
-	if (!dim)
-		return -1;
-
-	if (dim->n_in != 0 || dim->tuple_name[0] || dim->nested[0])
-		return 0;
-
-	return dim->nested[1] != NULL;
+	return isl_map_get_space(map);
 }
-
-__isl_give isl_dim *isl_dim_wrap(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_union_map_get_dim(__isl_keep isl_union_map *umap)
 {
-	isl_dim *wrap;
-
-	if (!dim)
-		return NULL;
-
-	wrap = isl_dim_alloc(dim->ctx, dim->nparam, 0, dim->n_in + dim->n_out);
-
-	wrap = copy_names(wrap, isl_dim_param, 0, dim, isl_dim_param);
-	wrap = copy_names(wrap, isl_dim_set, 0, dim, isl_dim_in);
-	wrap = copy_names(wrap, isl_dim_set, dim->n_in, dim, isl_dim_out);
-
-	if (!wrap)
-		goto error;
-
-	wrap->nested[1] = dim;
-
-	return wrap;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_union_map_get_space(umap);
 }
 
-__isl_give isl_dim *isl_dim_unwrap(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_basic_set_get_dim(__isl_keep isl_basic_set *bset)
 {
-	isl_dim *unwrap;
-
-	if (!dim)
-		return NULL;
-
-	if (!isl_dim_is_wrapping(dim))
-		isl_die(dim->ctx, isl_error_invalid, "not a wrapping dim",
-			goto error);
-
-	unwrap = isl_dim_copy(dim->nested[1]);
-	isl_dim_free(dim);
-
-	return unwrap;
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_basic_set_get_space(bset);
 }
-
-int isl_dim_is_named_or_nested(__isl_keep isl_dim *dim, enum isl_dim_type type)
+__isl_give isl_space *isl_set_get_dim(__isl_keep isl_set *set)
 {
-	if (type != isl_dim_in && type != isl_dim_out)
-		return 0;
-	if (!dim)
-		return -1;
-	if (dim->tuple_name[type - isl_dim_in])
-		return 1;
-	if (dim->nested[type - isl_dim_in])
-		return 1;
-	return 0;
+	return isl_set_get_space(set);
 }
-
-int isl_dim_may_be_set(__isl_keep isl_dim *dim)
+__isl_give isl_space *isl_union_set_get_dim(__isl_keep isl_union_set *uset)
 {
-	if (!dim)
-		return -1;
-	if (isl_dim_size(dim, isl_dim_in) != 0)
-		return 0;
-	if (isl_dim_is_named_or_nested(dim, isl_dim_in))
-		return 0;
-	return 1;
+	return isl_union_set_get_space(uset);
 }
 
-__isl_give isl_dim *isl_dim_reset(__isl_take isl_dim *dim,
-	enum isl_dim_type type)
+__isl_give isl_space *isl_point_get_dim(__isl_keep isl_point *pnt)
 {
-	if (!isl_dim_is_named_or_nested(dim, type))
-		return dim;
-
-	dim = isl_dim_cow(dim);
-	if (!dim)
-		return NULL;
-
-	isl_name_free(dim->ctx, dim->tuple_name[type - isl_dim_in]);
-	dim->tuple_name[type - isl_dim_in] = NULL;
-	isl_dim_free(dim->nested[type - isl_dim_in]);
-	dim->nested[type - isl_dim_in] = NULL;
-
-	return dim;
+	return isl_point_get_space(pnt);
 }
 
-__isl_give isl_dim *isl_dim_flatten(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_qpolynomial_get_dim(__isl_keep isl_qpolynomial *qp)
 {
-	if (!dim)
-		return NULL;
-	if (!dim->nested[0] && !dim->nested[1])
-		return dim;
-
-	if (dim->nested[0])
-		dim = isl_dim_reset(dim, isl_dim_in);
-	if (dim && dim->nested[1])
-		dim = isl_dim_reset(dim, isl_dim_out);
-
-	return dim;
+	return isl_qpolynomial_get_space(qp);
 }
-
-/* Replace the dimensions of the given type of dst by those of src.
- */
-__isl_give isl_dim *isl_dim_replace(__isl_take isl_dim *dst,
-	enum isl_dim_type type, __isl_keep isl_dim *src)
+__isl_give isl_space *isl_pw_qpolynomial_get_dim(
+	__isl_keep isl_pw_qpolynomial *pwqp)
 {
-	dst = isl_dim_cow(dst);
-
-	if (!dst || !src)
-		goto error;
-
-	dst = isl_dim_drop(dst, type, 0, isl_dim_size(dst, type));
-	dst = isl_dim_add(dst, type, isl_dim_size(src, type));
-	dst = copy_names(dst, type, 0, src, type);
-
-	if (dst && type == isl_dim_param) {
-		int i;
-		for (i = 0; i <= 1; ++i) {
-			if (!dst->nested[i])
-				continue;
-			dst->nested[i] = isl_dim_replace(dst->nested[i],
-							 type, src);
-			if (!dst->nested[i])
-				goto error;
-		}
-	}
-
-	return dst;
-error:
-	isl_dim_free(dst);
-	return NULL;
+	return isl_pw_qpolynomial_get_space(pwqp);
 }
-
-/* Given a dimension specification "dim" of a set, create a dimension
- * specification for the lift of the set.  In particular, the result
- * is of the form [dim -> local[..]], with n_local variables in the
- * range of the wrapped map.
- */
-__isl_give isl_dim *isl_dim_lift(__isl_take isl_dim *dim, unsigned n_local)
+__isl_give isl_space *isl_qpolynomial_fold_get_dim(
+	__isl_keep isl_qpolynomial_fold *fold)
 {
-	isl_dim *local_dim;
-
-	if (!dim)
-		return NULL;
-
-	local_dim = isl_dim_dup(dim);
-	local_dim = isl_dim_drop(local_dim, isl_dim_set, 0, dim->n_out);
-	local_dim = isl_dim_add(local_dim, isl_dim_set, n_local);
-	local_dim = isl_dim_set_tuple_name(local_dim, isl_dim_set, "local");
-	dim = isl_dim_join(isl_dim_from_domain(dim),
-			    isl_dim_from_range(local_dim));
-	dim = isl_dim_wrap(dim);
-	dim = isl_dim_set_tuple_name(dim, isl_dim_set, "lifted");
-
-	return dim;
+	return isl_qpolynomial_fold_get_space(fold);
 }
-
-int isl_dim_can_zip(__isl_keep isl_dim *dim)
+__isl_give isl_space *isl_pw_qpolynomial_fold_get_dim(
+	__isl_keep isl_pw_qpolynomial_fold *pwf)
 {
-	if (!dim)
-		return -1;
-
-	return dim->nested[0] && dim->nested[1];
+	return isl_pw_qpolynomial_fold_get_space(pwf);
 }
-
-__isl_give isl_dim *isl_dim_zip(__isl_take isl_dim *dim)
+__isl_give isl_space *isl_union_pw_qpolynomial_get_dim(
+	__isl_keep isl_union_pw_qpolynomial *upwqp)
 {
-	isl_dim *dom, *ran;
-	isl_dim *dom_dom, *dom_ran, *ran_dom, *ran_ran;
-
-	if (!isl_dim_can_zip(dim))
-		isl_die(dim->ctx, isl_error_invalid, "dim cannot be zipped",
-			goto error);
-
-	if (!dim)
-		return 0;
-	dom = isl_dim_unwrap(isl_dim_domain(isl_dim_copy(dim)));
-	ran = isl_dim_unwrap(isl_dim_range(dim));
-	dom_dom = isl_dim_domain(isl_dim_copy(dom));
-	dom_ran = isl_dim_range(dom);
-	ran_dom = isl_dim_domain(isl_dim_copy(ran));
-	ran_ran = isl_dim_range(ran);
-	dom = isl_dim_join(isl_dim_from_domain(dom_dom),
-			   isl_dim_from_range(ran_dom));
-	ran = isl_dim_join(isl_dim_from_domain(dom_ran),
-			   isl_dim_from_range(ran_ran));
-	return isl_dim_join(isl_dim_from_domain(isl_dim_wrap(dom)),
-			    isl_dim_from_range(isl_dim_wrap(ran)));
-error:
-	isl_dim_free(dim);
-	return NULL;
+	return isl_union_pw_qpolynomial_get_space(upwqp);
 }
-
-int isl_dim_has_named_params(__isl_keep isl_dim *dim)
+__isl_give isl_space *isl_union_pw_qpolynomial_fold_get_dim(
+	__isl_keep isl_union_pw_qpolynomial_fold *upwf)
 {
-	int i;
-	unsigned off;
-
-	if (!dim)
-		return -1;
-	if (dim->nparam == 0)
-		return 1;
-	off = isl_dim_offset(dim, isl_dim_param);
-	if (off + dim->nparam > dim->n_name)
-		return 0;
-	for (i = 0; i < dim->nparam; ++i)
-		if (!dim->names[off + i])
-			return 0;
-	return 1;
+	return isl_union_pw_qpolynomial_fold_get_space(upwf);
 }