X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_point.c;h=29c179813e5511f3c8b3682f6fc0a7fad49d3adc;hb=5951e56e5129b1061873a653060ed66f00b22150;hp=1833572edefd748c13a7a3b786b3d1be649b1941;hpb=ef20c9488b14fb24528a0b09a17d8933b5765afe;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_point.c b/isl_point.c
index 1833572..29c1798 100644
--- a/isl_point.c
+++ b/isl_point.c
@@ -1,11 +1,21 @@
-#include <isl_point_private.h>
-#include <isl_set.h>
 #include <isl_map_private.h>
+#include <isl_point_private.h>
+#include <isl/set.h>
 #include <isl_sample.h>
 #include <isl_scan.h>
-#include <isl_seq.h>
+#include <isl/seq.h>
 #include <isl_dim_private.h>
 
+isl_ctx *isl_point_get_ctx(__isl_keep isl_point *pnt)
+{
+	return pnt ? isl_dim_get_ctx(pnt->dim) : NULL;
+}
+
+__isl_give isl_dim *isl_point_get_dim(__isl_keep isl_point *pnt)
+{
+	return pnt ? isl_dim_copy(pnt->dim) : NULL;
+}
+
 __isl_give isl_point *isl_point_alloc(__isl_take isl_dim *dim,
 	__isl_take isl_vec *vec)
 {
@@ -320,7 +330,7 @@ int isl_set_contains_point(__isl_keep isl_set *set, __isl_keep isl_point *point)
 	return isl_map_contains_point((isl_map *)set, point);
 }
 
-__isl_give isl_set *isl_set_from_point(__isl_take isl_point *pnt)
+__isl_give isl_basic_set *isl_basic_set_from_point(__isl_take isl_point *pnt)
 {
 	isl_basic_set *bset;
 	isl_basic_set *model;
@@ -330,11 +340,18 @@ __isl_give isl_set *isl_set_from_point(__isl_take isl_point *pnt)
 	bset = isl_basic_set_from_underlying_set(bset, model);
 	isl_point_free(pnt);
 
+	return bset;
+}
+
+__isl_give isl_set *isl_set_from_point(__isl_take isl_point *pnt)
+{
+	isl_basic_set *bset;
+	bset = isl_basic_set_from_point(pnt);
 	return isl_set_from_basic_set(bset);
 }
 
-__isl_give isl_set *isl_set_box_from_points(__isl_take isl_point *pnt1,
-	__isl_take isl_point *pnt2)
+__isl_give isl_basic_set *isl_basic_set_box_from_points(
+	__isl_take isl_point *pnt1, __isl_take isl_point *pnt2)
 {
 	isl_basic_set *bset;
 	unsigned total;
@@ -355,17 +372,17 @@ __isl_give isl_set *isl_set_box_from_points(__isl_take isl_point *pnt1,
 		isl_point_free(pnt1);
 		isl_point_free(pnt2);
 		isl_int_clear(t);
-		return isl_set_empty(dim);
+		return isl_basic_set_empty(dim);
 	}
 	if (isl_point_is_void(pnt1)) {
 		isl_point_free(pnt1);
 		isl_int_clear(t);
-		return isl_set_from_point(pnt2);
+		return isl_basic_set_from_point(pnt2);
 	}
 	if (isl_point_is_void(pnt2)) {
 		isl_point_free(pnt2);
 		isl_int_clear(t);
-		return isl_set_from_point(pnt1);
+		return isl_basic_set_from_point(pnt1);
 	}
 
 	total = isl_dim_total(pnt1->dim);
@@ -409,7 +426,7 @@ __isl_give isl_set *isl_set_box_from_points(__isl_take isl_point *pnt1,
 
 	isl_int_clear(t);
 
-	return isl_set_from_basic_set(bset);
+	return bset;
 error:
 	isl_point_free(pnt1);
 	isl_point_free(pnt2);
@@ -417,47 +434,60 @@ error:
 	return NULL;
 }
 
-void isl_point_print(__isl_keep isl_point *pnt, FILE *out)
+__isl_give isl_set *isl_set_box_from_points(__isl_take isl_point *pnt1,
+	__isl_take isl_point *pnt2)
+{
+	isl_basic_set *bset;
+	bset = isl_basic_set_box_from_points(pnt1, pnt2);
+	return isl_set_from_basic_set(bset);
+}
+
+__isl_give isl_printer *isl_printer_print_point(
+	__isl_take isl_printer *p, __isl_keep isl_point *pnt)
 {
 	int i;
 	unsigned nparam;
 	unsigned dim;
 
 	if (!pnt)
-		return;
+		return p;
 	if (isl_point_is_void(pnt)) {
-		fprintf(out, "void\n");
-		return;
+		p = isl_printer_print_str(p, "void");
+		return p;
 	}
 
 	nparam = isl_dim_size(pnt->dim, isl_dim_param);
 	dim = isl_dim_size(pnt->dim, isl_dim_set);
 	if (nparam > 0) {
-		fprintf(out, "[");
+		p = isl_printer_print_str(p, "[");
 		for (i = 0; i < nparam; ++i) {
 			const char *name;
 			if (i)
-				fprintf(out, ", ");
+				p = isl_printer_print_str(p, ", ");
 			name = isl_dim_get_name(pnt->dim, isl_dim_param, i);
-			if (name)
-				fprintf(out, "%s = ", name);
-			isl_int_print(out, pnt->vec->el[1 + i], 0);
+			if (name) {
+				p = isl_printer_print_str(p, name);
+				p = isl_printer_print_str(p, " = ");
+			}
+			p = isl_printer_print_isl_int(p, pnt->vec->el[1 + i]);
 			if (!isl_int_is_one(pnt->vec->el[0])) {
-				fprintf(out, "/");
-				isl_int_print(out, pnt->vec->el[0], 0);
+				p = isl_printer_print_str(p, "/");
+				p = isl_printer_print_isl_int(p, pnt->vec->el[0]);
 			}
 		}
-		fprintf(out, "] -> ");
+		p = isl_printer_print_str(p, "]");
+		p = isl_printer_print_str(p, " -> ");
 	}
-	fprintf(out, "[");
+	p = isl_printer_print_str(p, "[");
 	for (i = 0; i < dim; ++i) {
 		if (i)
-			fprintf(out, ", ");
-		isl_int_print(out, pnt->vec->el[1 + nparam + i], 0);
+			p = isl_printer_print_str(p, ", ");
+		p = isl_printer_print_isl_int(p, pnt->vec->el[1 + nparam + i]);
 		if (!isl_int_is_one(pnt->vec->el[0])) {
-			fprintf(out, "/");
-			isl_int_print(out, pnt->vec->el[0], 0);
+			p = isl_printer_print_str(p, "/");
+			p = isl_printer_print_isl_int(p, pnt->vec->el[0]);
 		}
 	}
-	fprintf(out, "]\n");
+	p = isl_printer_print_str(p, "]");
+	return p;
 }