X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=isl_input.c;h=3fcf5e00620fd3e98c7464c23a08f25594a6037d;hb=fb87359c20272005e8764ad71acd3bd9619f25af;hp=b70b09140bd85550c0626837253a065aed5c5cb1;hpb=3a790f80d15f57dd863e6f3d341e0f05bb6b181d;p=platform%2Fupstream%2Fisl.git

diff --git a/isl_input.c b/isl_input.c
index b70b091..3fcf5e0 100644
--- a/isl_input.c
+++ b/isl_input.c
@@ -14,17 +14,20 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <isl_set.h>
-#include <isl_seq.h>
-#include <isl_div.h>
-#include "isl_stream.h"
+#include <isl/set.h>
+#include <isl/seq.h>
+#include <isl/div.h>
+#include <isl/stream.h>
 #include "isl_map_private.h"
-#include "isl_obj.h"
+#include <isl/obj.h>
 #include "isl_polynomial_private.h"
+#include <isl/union_map.h>
+#include <isl_mat_private.h>
 
 struct variable {
 	char    	    	*name;
 	int	     		 pos;
+	isl_vec			*def;
 	struct variable		*next;
 };
 
@@ -50,6 +53,7 @@ static void variable_free(struct variable *var)
 {
 	while (var) {
 		struct variable *next = var->next;
+		isl_vec_free(var->def);
 		free(var->name);
 		free(var);
 		var = next;
@@ -68,7 +72,7 @@ static void vars_drop(struct vars *v, int n)
 {
 	struct variable *var;
 
-	if (!v)
+	if (!v || !v->v)
 		return;
 
 	v->n -= n;
@@ -76,6 +80,7 @@ static void vars_drop(struct vars *v, int n)
 	var = v->v;
 	while (--n >= 0) {
 		struct variable *next = var->next;
+		isl_vec_free(var->def);
 		free(var->name);
 		free(var);
 		var = next;
@@ -93,6 +98,7 @@ static struct variable *variable_new(struct vars *v, const char *name, int len,
 	var->name = strdup(name);
 	var->name[len] = '\0';
 	var->pos = pos;
+	var->def = NULL;
 	var->next = v->v;
 	return var;
 error:
@@ -123,6 +129,17 @@ static int vars_pos(struct vars *v, const char *s, int len)
 	return pos;
 }
 
+static int vars_add_anon(struct vars *v)
+{
+	v->v = variable_new(v, "", 0, v->n);
+
+	if (!v->v)
+		return -1;
+	v->n++;
+
+	return 0;
+}
+
 static __isl_give isl_basic_map *set_name(__isl_take isl_basic_map *bmap,
 	enum isl_dim_type type, unsigned pos, char *name)
 {
@@ -136,17 +153,11 @@ static __isl_give isl_basic_map *set_name(__isl_take isl_basic_map *bmap,
 	prime = strchr(name, '\'');
 	if (prime)
 		*prime = '\0';
-	bmap->dim = isl_dim_set_name(bmap->dim, type, pos, name);
+	bmap = isl_basic_map_set_dim_name(bmap, type, pos, name);
 	if (prime)
 		*prime = '\'';
 
-	if (!bmap->dim)
-		goto error;
-
 	return bmap;
-error:
-	isl_basic_map_free(bmap);
-	return NULL;
 }
 
 static int accept_cst_factor(struct isl_stream *s, isl_int *f)
@@ -173,6 +184,7 @@ error:
 }
 
 static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v);
+static int read_div_definition(struct isl_stream *s, struct vars *v);
 
 static __isl_give isl_vec *accept_affine_factor(struct isl_stream *s,
 	struct vars *v)
@@ -221,6 +233,18 @@ static __isl_give isl_vec *accept_affine_factor(struct isl_stream *s,
 			goto error;
 		if (isl_stream_eat(s, ')'))
 			goto error;
+	} else if (tok->type == '[') {
+		if (vars_add_anon(v) < 0)
+			goto error;
+		aff = isl_vec_alloc(v->ctx, 1 + v->n);
+		if (!aff)
+			goto error;
+		isl_seq_clr(aff->el, aff->size);
+		isl_int_set_si(aff->el[1 + v->n - 1], 1);
+		isl_stream_push_token(s, tok);
+		tok = NULL;
+		if (read_div_definition(s, v) < 0)
+			goto error;
 	} else {
 		isl_stream_error(s, tok, "expecting factor");
 		goto error;
@@ -266,13 +290,15 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
 			isl_token_free(tok);
 			continue;
 		}
-		if (tok->type == '(' || tok->type == ISL_TOKEN_IDENT) {
+		if (tok->type == '(' || tok->type == '[' ||
+		    tok->type == ISL_TOKEN_IDENT) {
 			isl_vec *aff2;
 			isl_stream_push_token(s, tok);
 			tok = NULL;
 			aff2 = accept_affine_factor(s, v);
 			if (sign < 0)
 				aff2 = isl_vec_scale(aff2, s->ctx->negone);
+			aff = isl_vec_zero_extend(aff, 1 + v->n);
 			aff = isl_vec_add(aff, aff2);
 			if (!aff)
 				goto error;
@@ -285,6 +311,7 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
 				isl_vec *aff2;
 				aff2 = accept_affine_factor(s, v);
 				aff2 = isl_vec_scale(aff2, tok->u.v);
+				aff = isl_vec_zero_extend(aff, 1 + v->n);
 				aff = isl_vec_add(aff, aff2);
 				if (!aff)
 					goto error;
@@ -292,6 +319,11 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
 				isl_int_add(aff->el[0], aff->el[0], tok->u.v);
 			}
 			sign = 1;
+		} else {
+			isl_stream_error(s, tok, "unexpected isl_token");
+			isl_stream_push_token(s, tok);
+			isl_vec_free(aff);
+			return NULL;
 		}
 		isl_token_free(tok);
 
@@ -319,6 +351,87 @@ error:
 	return NULL;
 }
 
+/* Add any variables in the variable list "v" that are not already in "bmap"
+ * as existentially quantified variables in "bmap".
+ */
+static __isl_give isl_basic_map *add_divs(__isl_take isl_basic_map *bmap,
+	struct vars *v)
+{
+	int i;
+	int extra;
+	struct variable *var;
+
+	extra = v->n - isl_basic_map_total_dim(bmap);
+
+	if (extra == 0)
+		return bmap;
+
+	bmap = isl_basic_map_extend_dim(bmap, isl_basic_map_get_dim(bmap),
+					extra, 0, 2 * extra);
+
+	for (i = 0; i < extra; ++i)
+		if (isl_basic_map_alloc_div(bmap) < 0)
+			goto error;
+
+	for (i = 0, var = v->v; i < extra; ++i, var = var->next) {
+		int k = bmap->n_div - 1 - i;
+
+		isl_seq_cpy(bmap->div[k], var->def->el, var->def->size);
+		isl_seq_clr(bmap->div[k] + var->def->size,
+			    2 + v->n - var->def->size);
+
+		if (isl_basic_map_add_div_constraints(bmap, k) < 0)
+			goto error;
+	}
+
+	return bmap;
+error:
+	isl_basic_map_free(bmap);
+	return NULL;
+}
+
+static __isl_give isl_basic_map *read_var_def(struct isl_stream *s,
+	__isl_take isl_basic_map *bmap, enum isl_dim_type type, struct vars *v)
+{
+	isl_dim *dim;
+	isl_basic_map *def = NULL;
+	struct isl_vec *vec;
+	int k;
+	int n;
+
+	if (vars_add_anon(v) < 0)
+		goto error;
+	n = v->n;
+
+	vec = accept_affine(s, v);
+	if (!vec)
+		goto error;
+
+	dim = isl_basic_map_get_dim(bmap);
+	def = isl_basic_map_universe(dim);
+	def = add_divs(def, v);
+	def = isl_basic_map_extend_constraints(def, 1, 0);
+	k = isl_basic_map_alloc_equality(def);
+	if (k >= 0) {
+		isl_seq_cpy(def->eq[k], vec->el, vec->size);
+		isl_int_set_si(def->eq[k][1 + n - 1], -1);
+	}
+	isl_vec_free(vec);
+	if (k < 0)
+		goto error;
+
+	vars_drop(v, v->n - n);
+
+	def = isl_basic_map_simplify(def);
+	def = isl_basic_map_finalize(def);
+	bmap = isl_basic_map_intersect(bmap, def);
+	return bmap;
+error:
+	isl_basic_map_free(bmap);
+	isl_basic_map_free(def);
+	return NULL;
+}
+
 static __isl_give isl_basic_map *read_var_list(struct isl_stream *s,
 	__isl_take isl_basic_map *bmap, enum isl_dim_type type, struct vars *v)
 {
@@ -341,9 +454,9 @@ static __isl_give isl_basic_map *read_var_list(struct isl_stream *s,
 			bmap = set_name(bmap, type, i, v->v->name);
 			isl_token_free(tok);
 		} else if (tok->type == ISL_TOKEN_IDENT ||
-			   tok->type == ISL_TOKEN_VALUE) {
-			struct isl_vec *vec;
-			int k;
+			   tok->type == ISL_TOKEN_VALUE ||
+			   tok->type == '-' ||
+			   tok->type == '(') {
 			if (type == isl_dim_param) {
 				isl_stream_error(s, tok,
 						"expecting unique identifier");
@@ -351,23 +464,8 @@ static __isl_give isl_basic_map *read_var_list(struct isl_stream *s,
 			}
 			isl_stream_push_token(s, tok);
 			tok = NULL;
-			vec = accept_affine(s, v);
-			if (!vec)
-				goto error;
-			v->v = variable_new(v, "", 0, v->n);
-			if (!v->v)
-				goto error;
-			v->n++;
 			bmap = isl_basic_map_add(bmap, type, 1);
-			bmap = isl_basic_map_extend_constraints(bmap, 1, 0);
-			k = isl_basic_map_alloc_equality(bmap);
-			if (k >= 0) {
-				isl_seq_cpy(bmap->eq[k], vec->el, vec->size);
-				isl_int_set_si(bmap->eq[k][vec->size], -1);
-			}
-			isl_vec_free(vec);
-			if (k < 0)
-				goto error;
+			bmap = read_var_def(s, bmap, type, v);
 		} else
 			break;
 
@@ -413,6 +511,7 @@ static __isl_give isl_mat *accept_affine_list(struct isl_stream *s,
 		isl_token_free(tok);
 
 		vec = accept_affine(s, v);
+		mat = isl_mat_add_zero_cols(mat, 1 + v->n - isl_mat_cols(mat));
 		mat = isl_mat_vec_concat(mat, vec);
 		if (!mat)
 			return NULL;
@@ -424,52 +523,73 @@ error:
 	return NULL;
 }
 
-static struct isl_basic_map *add_div_definition(struct isl_stream *s,
-	struct vars *v, struct isl_basic_map *bmap, int k)
+static int read_div_definition(struct isl_stream *s, struct vars *v)
 {
 	struct isl_token *tok;
 	int seen_paren = 0;
 	struct isl_vec *aff;
+	struct variable *var;
 
 	if (isl_stream_eat(s, '['))
-		goto error;
+		return -1;
 
 	tok = isl_stream_next_token(s);
 	if (!tok)
-		goto error;
+		return -1;
 	if (tok->type == '(') {
 		seen_paren = 1;
 		isl_token_free(tok);
 	} else
 		isl_stream_push_token(s, tok);
 
+	var = v->v;
+
 	aff = accept_affine(s, v);
 	if (!aff)
-		goto error;
+		return -1;
 
-	isl_seq_cpy(bmap->div[k] + 1, aff->el, aff->size);
+	var->def = isl_vec_alloc(s->ctx, 2 + v->n);
+	if (!var->def) {
+		isl_vec_free(aff);
+		return -1;
+	}
+
+	isl_seq_cpy(var->def->el + 1, aff->el, aff->size);
 
 	isl_vec_free(aff);
 
 	if (seen_paren && isl_stream_eat(s, ')'))
-		goto error;
+		return -1;
 	if (isl_stream_eat(s, '/'))
-		goto error;
+		return -1;
 
 	tok = isl_stream_next_token(s);
 	if (!tok)
-		goto error;
+		return -1;
 	if (tok->type != ISL_TOKEN_VALUE) {
 		isl_stream_error(s, tok, "expected denominator");
 		isl_stream_push_token(s, tok);
-		goto error;
+		return -1;
 	}
-	isl_int_set(bmap->div[k][0], tok->u.v);
+	isl_int_set(var->def->el[0], tok->u.v);
 	isl_token_free(tok);
 
 	if (isl_stream_eat(s, ']'))
+		return -1;
+
+	return 0;
+}
+
+static struct isl_basic_map *add_div_definition(struct isl_stream *s,
+	struct vars *v, struct isl_basic_map *bmap, int k)
+{
+	struct variable *var = v->v;
+
+	if (read_div_definition(s, v) < 0)
 		goto error;
 
+	isl_seq_cpy(bmap->div[k], var->def->el, 2 + v->n);
+
 	if (isl_basic_map_add_div_constraints(bmap, k) < 0)
 		goto error;
 
@@ -532,18 +652,90 @@ error:
 	return NULL;
 }
 
+static int next_is_tuple(struct isl_stream *s)
+{
+	struct isl_token *tok;
+	int is_tuple;
+
+	tok = isl_stream_next_token(s);
+	if (!tok)
+		return 0;
+	if (tok->type == '[') {
+		isl_stream_push_token(s, tok);
+		return 1;
+	}
+	if (tok->type != ISL_TOKEN_IDENT) {
+		isl_stream_push_token(s, tok);
+		return 0;
+	}
+
+	is_tuple = isl_stream_next_token_is(s, '[');
+
+	isl_stream_push_token(s, tok);
+
+	return is_tuple;
+}
+
+static __isl_give isl_basic_map *read_tuple(struct isl_stream *s,
+	__isl_take isl_basic_map *bmap, enum isl_dim_type type, struct vars *v);
+
+static __isl_give isl_basic_map *read_nested_tuple(struct isl_stream *s,
+	__isl_take isl_basic_map *bmap, struct vars *v)
+{
+	bmap = read_tuple(s, bmap, isl_dim_in, v);
+	if (isl_stream_eat(s, ISL_TOKEN_TO))
+		goto error;
+	bmap = read_tuple(s, bmap, isl_dim_out, v);
+	bmap = isl_basic_map_from_range(isl_basic_map_wrap(bmap));
+	return bmap;
+error:
+	isl_basic_map_free(bmap);
+	return NULL;
+}
+
 static __isl_give isl_basic_map *read_tuple(struct isl_stream *s,
 	__isl_take isl_basic_map *bmap, enum isl_dim_type type, struct vars *v)
 {
 	struct isl_token *tok;
+	char *name = NULL;
 
 	tok = isl_stream_next_token(s);
+	if (tok && tok->type == ISL_TOKEN_IDENT) {
+		name = strdup(tok->u.s);
+		if (!name)
+			goto error;
+		isl_token_free(tok);
+		tok = isl_stream_next_token(s);
+	}
 	if (!tok || tok->type != '[') {
 		isl_stream_error(s, tok, "expecting '['");
 		goto error;
 	}
 	isl_token_free(tok);
-	bmap = read_var_list(s, bmap, type, v);
+	if (type != isl_dim_param && next_is_tuple(s)) {
+		isl_dim *dim = isl_basic_map_get_dim(bmap);
+		int nparam = isl_dim_size(dim, isl_dim_param);
+		int n_in = isl_dim_size(dim, isl_dim_in);
+		isl_basic_map *nested;
+		if (type == isl_dim_out)
+			dim = isl_dim_move(dim, isl_dim_param, nparam,
+						isl_dim_in, 0, n_in);
+		nested = isl_basic_map_alloc_dim(dim, 0, 0, 0);
+		nested = read_nested_tuple(s, nested, v);
+		if (type == isl_dim_in) {
+			nested = isl_basic_map_reverse(nested);
+			bmap = isl_basic_map_intersect(nested, bmap);
+		} else {
+			isl_basic_set *bset;
+			dim = isl_dim_range(isl_basic_map_get_dim(nested));
+			dim = isl_dim_drop(dim, isl_dim_param, nparam, n_in);
+			dim = isl_dim_join(isl_basic_map_get_dim(bmap), dim);
+			bset = isl_basic_map_domain(bmap);
+			nested = isl_basic_map_reset_dim(nested, dim);
+			bmap = isl_basic_map_intersect_domain(nested, bset);
+		}
+	} else
+		bmap = read_var_list(s, bmap, type, v);
 	tok = isl_stream_next_token(s);
 	if (!tok || tok->type != ']') {
 		isl_stream_error(s, tok, "expecting ']'");
@@ -551,6 +743,11 @@ static __isl_give isl_basic_map *read_tuple(struct isl_stream *s,
 	}
 	isl_token_free(tok);
 
+	if (name) {
+		bmap = isl_basic_map_set_tuple_name(bmap, type, name);
+		free(name);
+	}
+
 	return bmap;
 error:
 	if (tok)
@@ -664,7 +861,6 @@ static struct isl_basic_map *add_constraint(struct isl_stream *s,
 	struct vars *v, struct isl_basic_map *bmap)
 {
 	int i, j;
-	unsigned total = isl_basic_map_total_dim(bmap);
 	struct isl_token *tok = NULL;
 	struct isl_mat *aff1 = NULL, *aff2 = NULL;
 
@@ -691,13 +887,15 @@ static struct isl_basic_map *add_constraint(struct isl_stream *s,
 		tok = NULL;
 		goto error;
 	}
-	isl_assert(aff1->ctx, aff1->n_col == 1 + total, goto error);
 	for (;;) {
 		aff2 = accept_affine_list(s, v);
 		if (!aff2)
 			goto error;
-		isl_assert(aff2->ctx, aff2->n_col == 1 + total, goto error);
 
+		aff1 = isl_mat_add_zero_cols(aff1, aff2->n_col - aff1->n_col);
+		if (!aff1)
+			goto error;
+		bmap = add_divs(bmap, v);
 		bmap = isl_basic_map_extend_constraints(bmap, 0,
 						aff1->n_row * aff2->n_row);
 		for (i = 0; i < aff1->n_row; ++i)
@@ -948,6 +1146,13 @@ static __isl_give isl_basic_map *basic_map_read_polylib(struct isl_stream *s,
 		isl_stream_error(s, NULL, "unexpected EOF");
 		return NULL;
 	}
+	if (tok->type != ISL_TOKEN_VALUE || tok2->type != ISL_TOKEN_VALUE) {
+		isl_stream_push_token(s, tok2);
+		isl_stream_push_token(s, tok);
+		isl_stream_error(s, NULL,
+				 "expecting constraint matrix dimensions");
+		return NULL;
+	}
 	n_row = isl_int_get_si(tok->u.v);
 	n_col = isl_int_get_si(tok2->u.v);
 	on_new_line = tok2->on_new_line;
@@ -1014,6 +1219,7 @@ static __isl_give isl_basic_map *basic_map_read_polylib(struct isl_stream *s,
 		int k = isl_basic_map_alloc_div(bmap);
 		if (k < 0)
 			goto error;
+		isl_seq_clr(bmap->div[k], 1 + 1 + nparam + in + out + local);
 	}
 
 	for (i = 0; i < n_row; ++i)
@@ -1047,11 +1253,17 @@ static struct isl_map *map_read_polylib(struct isl_stream *s, int nparam)
 		return NULL;
 	}
 	tok2 = isl_stream_next_token_on_same_line(s);
-	if (tok2) {
+	if (tok2 && tok2->type == ISL_TOKEN_VALUE) {
 		isl_stream_push_token(s, tok2);
 		isl_stream_push_token(s, tok);
 		return isl_map_from_basic_map(basic_map_read_polylib(s, nparam));
 	}
+	if (tok2) {
+		isl_stream_error(s, tok2, "unexpected token");
+		isl_stream_push_token(s, tok2);
+		isl_stream_push_token(s, tok);
+		return NULL;
+	}
 	n = isl_int_get_si(tok->u.v);
 	isl_token_free(tok);
 
@@ -1059,7 +1271,7 @@ static struct isl_map *map_read_polylib(struct isl_stream *s, int nparam)
 
 	map = isl_map_from_basic_map(basic_map_read_polylib(s, nparam));
 
-	for (i = 1; i < n; ++i)
+	for (i = 1; map && i < n; ++i)
 		map = isl_map_union(map,
 			isl_map_from_basic_map(basic_map_read_polylib(s, nparam)));
 
@@ -1092,22 +1304,25 @@ static int optional_power(struct isl_stream *s)
 }
 
 static __isl_give isl_div *read_div(struct isl_stream *s,
-	__isl_keep isl_basic_map *bmap, struct vars *v)
+	__isl_take isl_dim *dim, struct vars *v)
 {
-	unsigned total = isl_basic_map_total_dim(bmap);
-	int k;
+	int n;
+	isl_basic_map *bmap;
 
-	bmap = isl_basic_map_copy(bmap);
-	bmap = isl_basic_map_cow(bmap);
-	bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
-					1, 0, 2);
+	n = v->n;
+	bmap = isl_basic_map_universe(dim);
 
-	if ((k = isl_basic_map_alloc_div(bmap)) < 0)
+	if (vars_add_anon(v) < 0)
+		goto error;
+	if (read_div_definition(s, v) < 0)
+		goto error;
+	bmap = add_divs(bmap, v);
+	bmap = isl_basic_map_order_divs(bmap);
+	if (!bmap)
 		goto error;
-	isl_seq_clr(bmap->div[k], 1 + 1 + total);
-	bmap = add_div_definition(s, v, bmap, k);
+	vars_drop(v, v->n - n);
 
-	return isl_basic_map_div(bmap, k);
+	return isl_basic_map_div(bmap, bmap->n_div - 1);
 error:
 	isl_basic_map_free(bmap);
 	return NULL;
@@ -1128,12 +1343,16 @@ static __isl_give isl_qpolynomial *read_factor(struct isl_stream *s,
 		return NULL;
 	}
 	if (tok->type == '(') {
+		int pow;
+
 		isl_token_free(tok);
 		qp = read_term(s, bmap, v);
 		if (!qp)
 			return NULL;
 		if (isl_stream_eat(s, ')'))
 			goto error;
+		pow = optional_power(s);
+		qp = isl_qpolynomial_pow(qp, pow);
 	} else if (tok->type == ISL_TOKEN_VALUE) {
 		struct isl_token *tok2;
 		tok2 = isl_stream_next_token(s);
@@ -1165,21 +1384,24 @@ static __isl_give isl_qpolynomial *read_factor(struct isl_stream *s,
 		int n = v->n;
 		int pos = vars_pos(v, tok->u.s, -1);
 		int pow;
-		isl_token_free(tok);
-		if (pos < 0)
-			goto error;
+		if (pos < 0) {
+			isl_token_free(tok);
+			return NULL;
+		}
 		if (pos >= n) {
 			isl_stream_error(s, tok, "unknown identifier");
+			isl_token_free(tok);
 			return NULL;
 		}
+		isl_token_free(tok);
 		pow = optional_power(s);
-		qp = isl_qpolynomial_pow(isl_basic_map_get_dim(bmap), pos, pow);
+		qp = isl_qpolynomial_var_pow(isl_basic_map_get_dim(bmap), pos, pow);
 	} else if (tok->type == '[') {
 		isl_div *div;
 		int pow;
 
 		isl_stream_push_token(s, tok);
-		div = read_div(s, bmap, v);
+		div = read_div(s, isl_basic_map_get_dim(bmap), v);
 		pow = optional_power(s);
 		qp = isl_qpolynomial_div_pow(div, pow);
 	} else if (tok->type == '-') {
@@ -1239,9 +1461,8 @@ static __isl_give isl_qpolynomial *read_term(struct isl_stream *s,
 			    isl_int_is_neg(tok->u.v)) {
 			struct isl_qpolynomial *qp2;
 
-			qp2 = isl_qpolynomial_cst(isl_basic_map_get_dim(bmap),
-							tok->u.v);
-			isl_token_free(tok);
+			isl_stream_push_token(s, tok);
+			qp2 = read_factor(s, bmap, v);
 			qp = isl_qpolynomial_add(qp, qp2);
 		} else {
 			isl_stream_push_token(s, tok);
@@ -1288,11 +1509,9 @@ static struct isl_obj obj_read_poly(struct isl_stream *s,
 	struct isl_map *map;
 	struct isl_set *set;
 
-	bmap = isl_basic_map_reverse(bmap);
-
 	qp = read_term(s, bmap, v);
 	map = read_optional_disjuncts(s, bmap, v);
-	set = isl_set_from_map(map);
+	set = isl_map_range(map);
 
 	pwqp = isl_pw_qpolynomial_alloc(set, qp);
 
@@ -1302,16 +1521,61 @@ static struct isl_obj obj_read_poly(struct isl_stream *s,
 	return obj;
 }
 
+static struct isl_obj obj_read_poly_or_fold(struct isl_stream *s,
+	__isl_take isl_basic_map *bmap, struct vars *v, int n)
+{
+	struct isl_obj obj = { isl_obj_pw_qpolynomial_fold, NULL };
+	struct isl_obj obj_p;
+	isl_qpolynomial *qp;
+	isl_qpolynomial_fold *fold = NULL;
+	isl_pw_qpolynomial_fold *pwf;
+	isl_map *map;
+	isl_set *set;
+
+	if (!isl_stream_eat_if_available(s, ISL_TOKEN_MAX))
+		return obj_read_poly(s, bmap, v, n);
+
+	if (isl_stream_eat(s, '('))
+		goto error;
+
+	qp = read_term(s, bmap, v);
+	fold = isl_qpolynomial_fold_alloc(isl_fold_max, qp);
+
+	while (isl_stream_eat_if_available(s, ',')) {
+		isl_qpolynomial_fold *fold_i;
+		qp = read_term(s, bmap, v);
+		fold_i = isl_qpolynomial_fold_alloc(isl_fold_max, qp);
+		fold = isl_qpolynomial_fold_fold(fold, fold_i);
+	}
+
+	if (isl_stream_eat(s, ')'))
+		goto error;
+
+	map = read_optional_disjuncts(s, bmap, v);
+	set = isl_map_range(map);
+	pwf = isl_pw_qpolynomial_fold_alloc(isl_fold_max, set, fold);
+
+	vars_drop(v, v->n - n);
+
+	obj.v = pwf;
+	return obj;
+error:
+	isl_basic_map_free(bmap);
+	isl_qpolynomial_fold_free(fold);
+	obj.type = isl_obj_none;
+	return obj;
+}
+
 static struct isl_obj obj_read_body(struct isl_stream *s,
-	__isl_take isl_basic_map *bmap, struct vars *v, isl_obj_type type)
+	__isl_take isl_basic_map *bmap, struct vars *v)
 {
 	struct isl_map *map = NULL;
 	struct isl_token *tok;
-	struct isl_obj obj = { type, NULL };
+	struct isl_obj obj = { isl_obj_set, NULL };
 	int n = v->n;
 
-	if (!isl_stream_next_token_is(s, '['))
-		return obj_read_poly(s, bmap, v, n);
+	if (!next_is_tuple(s))
+		return obj_read_poly_or_fold(s, bmap, v, n);
 
 	bmap = read_tuple(s, bmap, isl_dim_in, v);
 	if (!bmap)
@@ -1320,12 +1584,10 @@ static struct isl_obj obj_read_body(struct isl_stream *s,
 	if (tok && tok->type == ISL_TOKEN_TO) {
 		obj.type = isl_obj_map;
 		isl_token_free(tok);
-		tok = isl_stream_next_token(s);
-		if (tok && tok->type != '[') {
-			isl_stream_push_token(s, tok);
-			return obj_read_poly(s, bmap, v, n);
+		if (!next_is_tuple(s)) {
+			bmap = isl_basic_map_reverse(bmap);
+			return obj_read_poly_or_fold(s, bmap, v, n);
 		}
-		isl_stream_push_token(s, tok);
 		bmap = read_tuple(s, bmap, isl_dim_out, v);
 		if (!bmap)
 			goto error;
@@ -1347,10 +1609,71 @@ error:
 	return obj;
 }
 
+static struct isl_obj to_union(isl_ctx *ctx, struct isl_obj obj)
+{
+	if (obj.type == isl_obj_map) {
+		obj.v = isl_union_map_from_map(obj.v);
+		obj.type = isl_obj_union_map;
+	} else if (obj.type == isl_obj_set) {
+		obj.v = isl_union_set_from_set(obj.v);
+		obj.type = isl_obj_union_set;
+	} else if (obj.type == isl_obj_pw_qpolynomial) {
+		obj.v = isl_union_pw_qpolynomial_from_pw_qpolynomial(obj.v);
+		obj.type = isl_obj_union_pw_qpolynomial;
+	} else if (obj.type == isl_obj_pw_qpolynomial_fold) {
+		obj.v = isl_union_pw_qpolynomial_fold_from_pw_qpolynomial_fold(obj.v);
+		obj.type = isl_obj_union_pw_qpolynomial_fold;
+	} else
+		isl_assert(ctx, 0, goto error);
+	return obj;
+error:
+	obj.type->free(obj.v);
+	obj.type = isl_obj_none;
+	return obj;
+}
+
 static struct isl_obj obj_add(struct isl_ctx *ctx,
 	struct isl_obj obj1, struct isl_obj obj2)
 {
+	if (obj1.type == isl_obj_set && obj2.type == isl_obj_union_set)
+		obj1 = to_union(ctx, obj1);
+	if (obj1.type == isl_obj_union_set && obj2.type == isl_obj_set)
+		obj2 = to_union(ctx, obj2);
+	if (obj1.type == isl_obj_map && obj2.type == isl_obj_union_map)
+		obj1 = to_union(ctx, obj1);
+	if (obj1.type == isl_obj_union_map && obj2.type == isl_obj_map)
+		obj2 = to_union(ctx, obj2);
+	if (obj1.type == isl_obj_pw_qpolynomial &&
+	    obj2.type == isl_obj_union_pw_qpolynomial)
+		obj1 = to_union(ctx, obj1);
+	if (obj1.type == isl_obj_union_pw_qpolynomial &&
+	    obj2.type == isl_obj_pw_qpolynomial)
+		obj2 = to_union(ctx, obj2);
+	if (obj1.type == isl_obj_pw_qpolynomial_fold &&
+	    obj2.type == isl_obj_union_pw_qpolynomial_fold)
+		obj1 = to_union(ctx, obj1);
+	if (obj1.type == isl_obj_union_pw_qpolynomial_fold &&
+	    obj2.type == isl_obj_pw_qpolynomial_fold)
+		obj2 = to_union(ctx, obj2);
 	isl_assert(ctx, obj1.type == obj2.type, goto error);
+	if (obj1.type == isl_obj_map && !isl_map_has_equal_dim(obj1.v, obj2.v)) {
+		obj1 = to_union(ctx, obj1);
+		obj2 = to_union(ctx, obj2);
+	}
+	if (obj1.type == isl_obj_set && !isl_set_has_equal_dim(obj1.v, obj2.v)) {
+		obj1 = to_union(ctx, obj1);
+		obj2 = to_union(ctx, obj2);
+	}
+	if (obj1.type == isl_obj_pw_qpolynomial &&
+	    !isl_pw_qpolynomial_has_equal_dim(obj1.v, obj2.v)) {
+		obj1 = to_union(ctx, obj1);
+		obj2 = to_union(ctx, obj2);
+	}
+	if (obj1.type == isl_obj_pw_qpolynomial_fold &&
+	    !isl_pw_qpolynomial_fold_has_equal_dim(obj1.v, obj2.v)) {
+		obj1 = to_union(ctx, obj1);
+		obj2 = to_union(ctx, obj2);
+	}
 	obj1.v = obj1.type->add(obj1.v, obj2.v);
 	return obj1;
 error:
@@ -1363,7 +1686,7 @@ error:
 
 static struct isl_obj obj_read(struct isl_stream *s, int nparam)
 {
-	struct isl_basic_map *bmap = NULL;
+	isl_basic_map *bmap = NULL;
 	struct isl_token *tok;
 	struct vars *v = NULL;
 	struct isl_obj obj = { isl_obj_set, NULL };
@@ -1385,6 +1708,10 @@ static struct isl_obj obj_read(struct isl_stream *s, int nparam)
 		return obj;
 	}
 	v = vars_new(s->ctx);
+	if (!v) {
+		isl_stream_push_token(s, tok);
+		goto error;
+	}
 	bmap = isl_basic_map_alloc(s->ctx, 0, 0, 0, 0, 0, 0);
 	if (tok->type == '[') {
 		isl_stream_push_token(s, tok);
@@ -1424,21 +1751,26 @@ static struct isl_obj obj_read(struct isl_stream *s, int nparam)
 			goto error;
 		if (nparam >= 0)
 			isl_assert(s->ctx, nparam == v->n, goto error);
+	} else if (tok->type == '}') {
+		obj.type = isl_obj_union_set;
+		obj.v = isl_union_set_empty(isl_basic_map_get_dim(bmap));
+		isl_token_free(tok);
+		goto done;
 	} else
 		isl_stream_push_token(s, tok);
 
 	for (;;) {
 		struct isl_obj o;
 		tok = NULL;
-		o = obj_read_body(s, isl_basic_map_copy(bmap), v, obj.type);
-		if (o.type == isl_obj_none)
-			break;
+		o = obj_read_body(s, isl_basic_map_copy(bmap), v);
+		if (o.type == isl_obj_none || !o.v)
+			goto error;
 		if (!obj.v)
 			obj = o;
 		else {
 			obj = obj_add(s->ctx, obj, o);
-			if (obj.type == isl_obj_none)
-				break;
+			if (obj.type == isl_obj_none || !obj.v)
+				goto error;
 		}
 		tok = isl_stream_next_token(s);
 		if (!tok || tok->type != ';')
@@ -1454,6 +1786,7 @@ static struct isl_obj obj_read(struct isl_stream *s, int nparam)
 			isl_token_free(tok);
 		goto error;
 	}
+done:
 	vars_free(v);
 	isl_basic_map_free(bmap);
 
@@ -1503,6 +1836,49 @@ error:
 	return NULL;
 }
 
+__isl_give isl_union_map *isl_stream_read_union_map(struct isl_stream *s)
+{
+	struct isl_obj obj;
+	isl_union_map *umap;
+
+	obj = obj_read(s, -1);
+	if (obj.type == isl_obj_map) {
+		obj.type = isl_obj_union_map;
+		obj.v = isl_union_map_from_map(obj.v);
+	}
+	if (obj.type == isl_obj_set) {
+		obj.type = isl_obj_union_set;
+		obj.v = isl_union_set_from_set(obj.v);
+	}
+	if (obj.v)
+		isl_assert(s->ctx, obj.type == isl_obj_union_map ||
+				   obj.type == isl_obj_union_set, goto error);
+
+	return obj.v;
+error:
+	obj.type->free(obj.v);
+	return NULL;
+}
+
+__isl_give isl_union_set *isl_stream_read_union_set(struct isl_stream *s)
+{
+	struct isl_obj obj;
+	isl_union_set *uset;
+
+	obj = obj_read(s, -1);
+	if (obj.type == isl_obj_set) {
+		obj.type = isl_obj_union_set;
+		obj.v = isl_union_set_from_set(obj.v);
+	}
+	if (obj.v)
+		isl_assert(s->ctx, obj.type == isl_obj_union_set, goto error);
+
+	return obj.v;
+error:
+	obj.type->free(obj.v);
+	return NULL;
+}
+
 static struct isl_basic_map *basic_map_read(struct isl_stream *s, int nparam)
 {
 	struct isl_obj obj;
@@ -1633,60 +2009,83 @@ error:
 	return NULL;
 }
 
-static char *next_line(FILE *input, char *line, unsigned len)
+__isl_give isl_union_map *isl_union_map_read_from_str(struct isl_ctx *ctx,
+		const char *str)
 {
-	char *p;
-
-	do {
-		if (!(p = fgets(line, len, input)))
-			return NULL;
-		while (isspace(*p) && *p != '\n')
-			++p;
-	} while (*p == '#' || *p == '\n');
+	isl_union_map *umap;
+	struct isl_stream *s = isl_stream_new_str(ctx, str);
+	if (!s)
+		return NULL;
+	umap = isl_stream_read_union_map(s);
+	isl_stream_free(s);
+	return umap;
+}
 
-	return p;
+__isl_give isl_union_set *isl_union_set_read_from_str(struct isl_ctx *ctx,
+		const char *str)
+{
+	isl_union_set *uset;
+	struct isl_stream *s = isl_stream_new_str(ctx, str);
+	if (!s)
+		return NULL;
+	uset = isl_stream_read_union_set(s);
+	isl_stream_free(s);
+	return uset;
 }
 
-static struct isl_vec *isl_vec_read_from_file_polylib(struct isl_ctx *ctx,
-		FILE *input)
+static __isl_give isl_vec *isl_vec_read_polylib(struct isl_stream *s)
 {
 	struct isl_vec *vec = NULL;
-	char line[1024];
-	char val[1024];
-	char *p;
+	struct isl_token *tok;
 	unsigned size;
 	int j;
-	int n;
-	int offset;
 
-	isl_assert(ctx, next_line(input, line, sizeof(line)), return NULL);
-	isl_assert(ctx, sscanf(line, "%u", &size) == 1, return NULL);
+	tok = isl_stream_next_token(s);
+	if (!tok || tok->type != ISL_TOKEN_VALUE) {
+		isl_stream_error(s, tok, "expecting vector length");
+		goto error;
+	}
 
-	vec = isl_vec_alloc(ctx, size);
+	size = isl_int_get_si(tok->u.v);
+	isl_token_free(tok);
 
-	p = next_line(input, line, sizeof(line));
-	isl_assert(ctx, p, goto error);
+	vec = isl_vec_alloc(s->ctx, size);
 
 	for (j = 0; j < size; ++j) {
-		n = sscanf(p, "%s%n", val, &offset);
-		isl_assert(ctx, n != 0, goto error);
-		isl_int_read(vec->el[j], val);
-		p += offset;
+		tok = isl_stream_next_token(s);
+		if (!tok || tok->type != ISL_TOKEN_VALUE) {
+			isl_stream_error(s, tok, "expecting constant value");
+			goto error;
+		}
+		isl_int_set(vec->el[j], tok->u.v);
+		isl_token_free(tok);
 	}
 
 	return vec;
 error:
+	isl_token_free(tok);
 	isl_vec_free(vec);
 	return NULL;
 }
 
+static __isl_give isl_vec *vec_read(struct isl_stream *s,
+	unsigned input_format)
+{
+	if (input_format == ISL_FORMAT_POLYLIB)
+		return isl_vec_read_polylib(s);
+	isl_assert(s->ctx, 0, return NULL);
+}
+
 struct isl_vec *isl_vec_read_from_file(struct isl_ctx *ctx,
 		FILE *input, unsigned input_format)
 {
-	if (input_format == ISL_FORMAT_POLYLIB)
-		return isl_vec_read_from_file_polylib(ctx, input);
-	else
-		isl_assert(ctx, 0, return NULL);
+	isl_vec *v;
+	struct isl_stream *s = isl_stream_new_file(ctx, input);
+	if (!s)
+		return NULL;
+	v = vec_read(s, input_format);
+	isl_stream_free(s);
+	return v;
 }
 
 __isl_give isl_pw_qpolynomial *isl_stream_read_pw_qpolynomial(
@@ -1705,3 +2104,15 @@ error:
 	obj.type->free(obj.v);
 	return NULL;
 }
+
+__isl_give isl_pw_qpolynomial *isl_pw_qpolynomial_read_from_str(isl_ctx *ctx,
+		const char *str)
+{
+	isl_pw_qpolynomial *pwqp;
+	struct isl_stream *s = isl_stream_new_str(ctx, str);
+	if (!s)
+		return NULL;
+	pwqp = isl_stream_read_pw_qpolynomial(s);
+	isl_stream_free(s);
+	return pwqp;
+}