X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_map_piplib.c;h=165fdaebb4bb39699e75ce443da1bcb0c3ff5b1e;hb=de51a9bc4da5dd3f1f9f57c2362da6f9752c44e0;hp=65a9f67dc82992e6c7c044280c06ca2db65659da;hpb=f08d844c3114aa51b60728cdc1b2442fb6100033;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_map_piplib.c b/isl_map_piplib.c
index 65a9f67..165fdae 100644
--- a/isl_map_piplib.c
+++ b/isl_map_piplib.c
@@ -1,19 +1,20 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
  *
- * Use of this software is governed by the GNU LGPLv2.1 license
+ * Use of this software is governed by the MIT license
  *
  * Written by Sven Verdoolaege, K.U.Leuven, Departement
  * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium
  */
 
-#include "isl_set.h"
-#include "isl_map.h"
-#include "isl_mat.h"
-#include "isl_seq.h"
+#include <isl_ctx_private.h>
+#include <isl_map_private.h>
+#include <isl/set.h>
+#include <isl/map.h>
+#include <isl/mat.h>
+#include <isl/seq.h>
 #include "isl_piplib.h"
 #include "isl_map_piplib.h"
-#include "isl_map_private.h"
 
 static void copy_values_from(isl_int *dst, Entier *src, unsigned n)
 {
@@ -255,11 +256,11 @@ error:
 
 /*
  * Returns a map of dimension "keep_dim" with "context" as domain and
- * as range the first "isl_dim_size(keep_dim, isl_dim_out)" variables
+ * as range the first "isl_space_dim(keep_dim, isl_dim_out)" variables
  * in the quast lists.
  */
 static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
-		struct isl_dim *keep_dim,
+		isl_space *keep_dim,
 		struct isl_basic_set *context,
 		struct isl_set **rest)
 {
@@ -269,7 +270,7 @@ static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
 	int		n_sol, n_nosol;
 	struct scan_data	data;
 	struct isl_map		*map = NULL;
-	struct isl_dim		*dims;
+	isl_space		*dims;
 	unsigned		nparam;
 	unsigned		dim;
 	unsigned		keep;
@@ -284,7 +285,7 @@ static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
 
 	dim = isl_basic_set_n_dim(context);
 	nparam = isl_basic_set_n_param(context);
-	keep = isl_dim_size(keep_dim, isl_dim_out);
+	keep = isl_space_dim(keep_dim, isl_dim_out);
 	pip_param = nparam + dim;
 
 	max_depth = 0;
@@ -295,19 +296,19 @@ static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
 	nexist -= pip_param-1;
 
 	if (rest) {
-		*rest = isl_set_alloc_dim(isl_dim_copy(context->dim), n_nosol,
+		*rest = isl_set_alloc_space(isl_space_copy(context->dim), n_nosol,
 					ISL_MAP_DISJOINT);
 		if (!*rest)
 			goto error;
 	}
-	map = isl_map_alloc_dim(isl_dim_copy(keep_dim), n_sol,
+	map = isl_map_alloc_space(isl_space_copy(keep_dim), n_sol,
 				ISL_MAP_DISJOINT);
 	if (!map)
 		goto error;
 
-	dims = isl_dim_reverse(isl_dim_copy(context->dim));
+	dims = isl_space_reverse(isl_space_copy(context->dim));
 	data.bmap = isl_basic_map_from_basic_set(context, dims);
-	data.bmap = isl_basic_map_extend_dim(data.bmap,
+	data.bmap = isl_basic_map_extend_space(data.bmap,
 		keep_dim, nexist, keep, max_depth+2*nexist);
 	if (!data.bmap)
 		goto error2;
@@ -336,7 +337,7 @@ static struct isl_map *isl_map_from_quast(struct isl_ctx *ctx, PipQuast *q,
 	return map;
 error:
 	isl_basic_set_free(context);
-	isl_dim_free(keep_dim);
+	isl_space_free(keep_dim);
 error2:
 	if (data.pos)
 		free(data.pos);
@@ -443,7 +444,7 @@ struct isl_map *isl_pip_basic_map_lexopt(
 		struct isl_basic_set *copy;
 		copy = isl_basic_set_copy(dom);
 		map = isl_map_from_quast(ctx, sol,
-				isl_dim_copy(bmap->dim), copy, empty);
+				isl_space_copy(bmap->dim), copy, empty);
 	} else {
 		map = isl_map_empty_like_basic_map(bmap);
 		if (empty)