isl_tab_pip.c: fix typos in comments
[platform/upstream/isl.git] / isl_input.c
index f1790e1..3fcf5e0 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <isl_set.h>
-#include <isl_seq.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_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;
 };
 
@@ -47,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;
@@ -65,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;
@@ -73,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;
@@ -90,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:
@@ -120,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)
 {
@@ -133,16 +153,118 @@ 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)
+       return bmap;
+}
+
+static int accept_cst_factor(struct isl_stream *s, isl_int *f)
+{
+       struct isl_token *tok;
+
+       tok = isl_stream_next_token(s);
+       if (!tok || tok->type != ISL_TOKEN_VALUE) {
+               isl_stream_error(s, tok, "expecting constant value");
                goto error;
+       }
 
-       return bmap;
+       isl_int_mul(*f, *f, tok->u.v);
+
+       isl_token_free(tok);
+
+       if (isl_stream_eat_if_available(s, '*'))
+               return accept_cst_factor(s, f);
+
+       return 0;
 error:
-       isl_basic_map_free(bmap);
+       isl_token_free(tok);
+       return -1;
+}
+
+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)
+{
+       struct isl_token *tok = NULL;
+       isl_vec *aff = NULL;
+
+       tok = isl_stream_next_token(s);
+       if (!tok) {
+               isl_stream_error(s, NULL, "unexpected EOF");
+               goto error;
+       }
+       if (tok->type == ISL_TOKEN_IDENT) {
+               int n = v->n;
+               int pos = vars_pos(v, tok->u.s, -1);
+               if (pos < 0)
+                       goto error;
+               if (pos >= n) {
+                       isl_stream_error(s, tok, "unknown identifier");
+                       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 + pos], 1);
+               isl_token_free(tok);
+       } else if (tok->type == ISL_TOKEN_VALUE) {
+               if (isl_stream_eat_if_available(s, '*')) {
+                       aff = accept_affine_factor(s, v);
+                       aff = isl_vec_scale(aff, tok->u.v);
+               } else {
+                       aff = isl_vec_alloc(v->ctx, 1 + v->n);
+                       if (!aff)
+                               goto error;
+                       isl_seq_clr(aff->el, aff->size);
+                       isl_int_set(aff->el[0], tok->u.v);
+               }
+               isl_token_free(tok);
+       } else if (tok->type == '(') {
+               isl_token_free(tok);
+               tok = NULL;
+               aff = accept_affine(s, v);
+               if (!aff)
+                       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;
+       }
+       if (isl_stream_eat_if_available(s, '*')) {
+               isl_int f;
+               isl_int_init(f);
+               isl_int_set_si(f, 1);
+               if (accept_cst_factor(s, &f) < 0) {
+                       isl_int_clear(f);
+                       goto error;
+               }
+               aff = isl_vec_scale(aff, f);
+               isl_int_clear(f);
+       }
+
+       return aff;
+error:
+       isl_token_free(tok);
+       isl_vec_free(aff);
        return NULL;
 }
 
@@ -153,9 +275,9 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
        int sign = 1;
 
        aff = isl_vec_alloc(v->ctx, 1 + v->n);
-       isl_seq_clr(aff->el, aff->size);
        if (!aff)
                return NULL;
+       isl_seq_clr(aff->el, aff->size);
 
        for (;;) {
                tok = isl_stream_next_token(s);
@@ -163,62 +285,153 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
                        isl_stream_error(s, NULL, "unexpected EOF");
                        goto error;
                }
-               if (tok->type == ISL_TOKEN_IDENT) {
-                       int n = v->n;
-                       int pos = vars_pos(v, tok->u.s, -1);
-                       if (pos < 0)
-                               goto error;
-                       if (pos >= n) {
-                               isl_stream_error(s, tok, "unknown identifier");
+               if (tok->type == '-') {
+                       sign = -sign;
+                       isl_token_free(tok);
+                       continue;
+               }
+               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;
-                       }
-                       if (sign > 0)
-                               isl_int_add_ui(aff->el[1 + pos],
-                                              aff->el[1 + pos], 1);
-                       else
-                               isl_int_sub_ui(aff->el[1 + pos],
-                                              aff->el[1 + pos], 1);
                        sign = 1;
                } else if (tok->type == ISL_TOKEN_VALUE) {
-                       struct isl_token *tok2;
-                       int n = v->n;
-                       int pos = -1;
-                       tok2 = isl_stream_next_token(s);
-                       if (tok2 && tok2->type == ISL_TOKEN_IDENT) {
-                               pos = vars_pos(v, tok2->u.s, -1);
-                               if (pos < 0)
-                                       goto error;
-                               if (pos >= n) {
-                                       isl_stream_error(s, tok2,
-                                               "unknown identifier");
-                                       isl_token_free(tok2);
-                                       goto error;
-                               }
-                               isl_token_free(tok2);
-                       } else if (tok2)
-                               isl_stream_push_token(s, tok2);
                        if (sign < 0)
                                isl_int_neg(tok->u.v, tok->u.v);
-                       isl_int_add(aff->el[1 + pos],
-                                       aff->el[1 + pos], tok->u.v);
+                       if (isl_stream_eat_if_available(s, '*') ||
+                           isl_stream_next_token_is(s, ISL_TOKEN_IDENT)) {
+                               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;
+                       } else {
+                               isl_int_add(aff->el[0], aff->el[0], tok->u.v);
+                       }
                        sign = 1;
-               } else if (tok->type == '-') {
+               } 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);
+
+               tok = isl_stream_next_token(s);
+               if (tok && tok->type == '-') {
                        sign = -sign;
-               } else if (tok->type == '+') {
+                       isl_token_free(tok);
+               } else if (tok && tok->type == '+') {
                        /* nothing */
-               } else {
+                       isl_token_free(tok);
+               } else if (tok && tok->type == ISL_TOKEN_VALUE &&
+                          isl_int_is_neg(tok->u.v)) {
                        isl_stream_push_token(s, tok);
+               } else {
+                       if (tok)
+                               isl_stream_push_token(s, tok);
                        break;
                }
-               isl_token_free(tok);
        }
 
        return aff;
 error:
+       isl_token_free(tok);
        isl_vec_free(aff);
        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)
 {
@@ -241,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");
@@ -251,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;
 
@@ -313,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;
@@ -324,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;
+
+       var->def = isl_vec_alloc(s->ctx, 2 + v->n);
+       if (!var->def) {
+               isl_vec_free(aff);
+               return -1;
+       }
 
-       isl_seq_cpy(bmap->div[k] + 1, aff->el, aff->size);
+       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;
 
@@ -400,7 +620,6 @@ static struct isl_basic_map *read_defined_var_list(struct isl_stream *s,
                        isl_stream_error(s, tok, "expecting unique identifier");
                        goto error;
                }
-               isl_token_free(tok);
 
                bmap = isl_basic_map_cow(bmap);
                bmap = isl_basic_map_extend_dim(bmap, isl_dim_copy(bmap->dim),
@@ -410,6 +629,7 @@ static struct isl_basic_map *read_defined_var_list(struct isl_stream *s,
                        goto error;
                isl_seq_clr(bmap->div[k], 1 + 1 + total);
 
+               isl_token_free(tok);
                tok = isl_stream_next_token(s);
                if (tok && tok->type == '=') {
                        isl_token_free(tok);
@@ -432,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 ']'");
@@ -451,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)
@@ -564,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;
 
@@ -591,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)
@@ -848,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;
@@ -914,11 +1219,19 @@ 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)
                bmap = basic_map_read_polylib_constraint(s, bmap);
 
+       tok = isl_stream_next_token_on_same_line(s);
+       if (tok) {
+               isl_stream_error(s, tok, "unexpected extra token on line");
+               isl_stream_push_token(s, tok);
+               goto error;
+       }
+
        bmap = isl_basic_map_simplify(bmap);
        bmap = isl_basic_map_finalize(bmap);
        return bmap;
@@ -939,18 +1252,18 @@ static struct isl_map *map_read_polylib(struct isl_stream *s, int nparam)
                isl_stream_error(s, NULL, "unexpected EOF");
                return NULL;
        }
-       tok2 = isl_stream_next_token(s);
-       if (!tok2) {
-               isl_token_free(tok);
-               isl_stream_error(s, NULL, "unexpected EOF");
-               return NULL;
-       }
-       if (!tok2->on_new_line) {
+       tok2 = isl_stream_next_token_on_same_line(s);
+       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));
        }
-       isl_stream_push_token(s, tok2);
+       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);
 
@@ -958,34 +1271,214 @@ 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)));
 
        return map;
 }
 
-static struct isl_map *map_read_body(struct isl_stream *s,
-       __isl_take isl_basic_map *bmap, struct vars *v)
+static int optional_power(struct isl_stream *s)
 {
-       struct isl_map *map = NULL;
+       int pow;
        struct isl_token *tok;
-       int n = v->n;
 
-       bmap = read_tuple(s, bmap, isl_dim_in, v);
-       if (!bmap)
-               goto error;
        tok = isl_stream_next_token(s);
-       if (tok && tok->type == ISL_TOKEN_TO) {
-               isl_token_free(tok);
-               bmap = read_tuple(s, bmap, isl_dim_out, v);
-               if (!bmap)
-                       goto error;
-       } else {
-               bmap = isl_basic_map_reverse(bmap);
-               if (tok)
-                       isl_stream_push_token(s, tok);
-       }
+       if (!tok)
+               return 1;
+       if (tok->type != '^') {
+               isl_stream_push_token(s, tok);
+               return 1;
+       }
+       isl_token_free(tok);
+       tok = isl_stream_next_token(s);
+       if (!tok || tok->type != ISL_TOKEN_VALUE) {
+               isl_stream_error(s, tok, "expecting exponent");
+               if (tok)
+                       isl_stream_push_token(s, tok);
+               return 1;
+       }
+       pow = isl_int_get_si(tok->u.v);
+       isl_token_free(tok);
+       return pow;
+}
+
+static __isl_give isl_div *read_div(struct isl_stream *s,
+       __isl_take isl_dim *dim, struct vars *v)
+{
+       int n;
+       isl_basic_map *bmap;
+
+       n = v->n;
+       bmap = isl_basic_map_universe(dim);
+
+       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;
+       vars_drop(v, v->n - n);
+
+       return isl_basic_map_div(bmap, bmap->n_div - 1);
+error:
+       isl_basic_map_free(bmap);
+       return NULL;
+}
+
+static __isl_give isl_qpolynomial *read_term(struct isl_stream *s,
+       __isl_keep isl_basic_map *bmap, struct vars *v);
+
+static __isl_give isl_qpolynomial *read_factor(struct isl_stream *s,
+       __isl_keep isl_basic_map *bmap, struct vars *v)
+{
+       struct isl_qpolynomial *qp;
+       struct isl_token *tok;
+
+       tok = isl_stream_next_token(s);
+       if (!tok) {
+               isl_stream_error(s, NULL, "unexpected EOF");
+               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);
+               if (tok2 && tok2->type == '/') {
+                       isl_token_free(tok2);
+                       tok2 = isl_stream_next_token(s);
+                       if (!tok2 || tok2->type != ISL_TOKEN_VALUE) {
+                               isl_stream_error(s, tok2, "expected denominator");
+                               isl_token_free(tok);
+                               isl_token_free(tok2);
+                               return NULL;
+                       }
+                       qp = isl_qpolynomial_rat_cst(isl_basic_map_get_dim(bmap),
+                                                   tok->u.v, tok2->u.v);
+                       isl_token_free(tok2);
+               } else {
+                       isl_stream_push_token(s, tok2);
+                       qp = isl_qpolynomial_cst(isl_basic_map_get_dim(bmap),
+                                               tok->u.v);
+               }
+               isl_token_free(tok);
+       } else if (tok->type == ISL_TOKEN_INFTY) {
+               isl_token_free(tok);
+               qp = isl_qpolynomial_infty(isl_basic_map_get_dim(bmap));
+       } else if (tok->type == ISL_TOKEN_NAN) {
+               isl_token_free(tok);
+               qp = isl_qpolynomial_nan(isl_basic_map_get_dim(bmap));
+       } else if (tok->type == ISL_TOKEN_IDENT) {
+               int n = v->n;
+               int pos = vars_pos(v, tok->u.s, -1);
+               int pow;
+               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_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, isl_basic_map_get_dim(bmap), v);
+               pow = optional_power(s);
+               qp = isl_qpolynomial_div_pow(div, pow);
+       } else if (tok->type == '-') {
+               struct isl_qpolynomial *qp2;
+
+               isl_token_free(tok);
+               qp = isl_qpolynomial_cst(isl_basic_map_get_dim(bmap),
+                                           s->ctx->negone);
+               qp2 = read_factor(s, bmap, v);
+               qp = isl_qpolynomial_mul(qp, qp2);
+       } else {
+               isl_stream_error(s, tok, "unexpected isl_token");
+               isl_stream_push_token(s, tok);
+               return NULL;
+       }
+
+       if (isl_stream_eat_if_available(s, '*') ||
+           isl_stream_next_token_is(s, ISL_TOKEN_IDENT)) {
+               struct isl_qpolynomial *qp2;
+
+               qp2 = read_factor(s, bmap, v);
+               qp = isl_qpolynomial_mul(qp, qp2);
+       }
+
+       return qp;
+error:
+       isl_qpolynomial_free(qp);
+       return NULL;
+}
+
+static __isl_give isl_qpolynomial *read_term(struct isl_stream *s,
+       __isl_keep isl_basic_map *bmap, struct vars *v)
+{
+       struct isl_token *tok;
+       struct isl_qpolynomial *qp;
+
+       qp = read_factor(s, bmap, v);
+
+       for (;;) {
+               tok = isl_stream_next_token(s);
+               if (!tok)
+                       return qp;
+
+               if (tok->type == '+') {
+                       struct isl_qpolynomial *qp2;
+
+                       isl_token_free(tok);
+                       qp2 = read_factor(s, bmap, v);
+                       qp = isl_qpolynomial_add(qp, qp2);
+               } else if (tok->type == '-') {
+                       struct isl_qpolynomial *qp2;
+
+                       isl_token_free(tok);
+                       qp2 = read_factor(s, bmap, v);
+                       qp = isl_qpolynomial_sub(qp, qp2);
+               } else if (tok->type == ISL_TOKEN_VALUE &&
+                           isl_int_is_neg(tok->u.v)) {
+                       struct isl_qpolynomial *qp2;
+
+                       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);
+                       break;
+               }
+       }
+
+       return qp;
+}
+
+static __isl_give isl_map *read_optional_disjuncts(struct isl_stream *s,
+       __isl_take isl_basic_map *bmap, struct vars *v)
+{
+       struct isl_token *tok;
+       struct isl_map *map;
+
        tok = isl_stream_next_token(s);
        if (!tok) {
                isl_stream_error(s, NULL, "unexpected EOF");
@@ -999,21 +1492,204 @@ static struct isl_map *map_read_body(struct isl_stream *s,
        } else
                isl_stream_push_token(s, tok);
 
-       vars_drop(v, v->n - n);
-
        isl_basic_map_free(bmap);
+
        return map;
 error:
        isl_basic_map_free(bmap);
        return NULL;
 }
 
-static struct isl_map *map_read(struct isl_stream *s, int nparam)
+static struct isl_obj obj_read_poly(struct isl_stream *s,
+       __isl_take isl_basic_map *bmap, struct vars *v, int n)
+{
+       struct isl_obj obj = { isl_obj_pw_qpolynomial, NULL };
+       struct isl_pw_qpolynomial *pwqp;
+       struct isl_qpolynomial *qp;
+       struct isl_map *map;
+       struct isl_set *set;
+
+       qp = read_term(s, bmap, v);
+       map = read_optional_disjuncts(s, bmap, v);
+       set = isl_map_range(map);
+
+       pwqp = isl_pw_qpolynomial_alloc(set, qp);
+
+       vars_drop(v, v->n - n);
+
+       obj.v = pwqp;
+       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)
 {
-       struct isl_basic_map *bmap = NULL;
        struct isl_map *map = NULL;
        struct isl_token *tok;
+       struct isl_obj obj = { isl_obj_set, NULL };
+       int n = 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)
+               goto error;
+       tok = isl_stream_next_token(s);
+       if (tok && tok->type == ISL_TOKEN_TO) {
+               obj.type = isl_obj_map;
+               isl_token_free(tok);
+               if (!next_is_tuple(s)) {
+                       bmap = isl_basic_map_reverse(bmap);
+                       return obj_read_poly_or_fold(s, bmap, v, n);
+               }
+               bmap = read_tuple(s, bmap, isl_dim_out, v);
+               if (!bmap)
+                       goto error;
+       } else {
+               bmap = isl_basic_map_reverse(bmap);
+               if (tok)
+                       isl_stream_push_token(s, tok);
+       }
+
+       map = read_optional_disjuncts(s, bmap, v);
+
+       vars_drop(v, v->n - n);
+
+       obj.v = map;
+       return obj;
+error:
+       isl_basic_map_free(bmap);
+       obj.type = isl_obj_none;
+       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:
+       obj1.type->free(obj1.v);
+       obj2.type->free(obj2.v);
+       obj1.type = isl_obj_none;
+       obj1.v = NULL;
+       return obj1;
+}
+
+static struct isl_obj obj_read(struct isl_stream *s, int nparam)
+{
+       isl_basic_map *bmap = NULL;
+       struct isl_token *tok;
        struct vars *v = NULL;
+       struct isl_obj obj = { isl_obj_set, NULL };
 
        tok = isl_stream_next_token(s);
        if (!tok) {
@@ -1021,10 +1697,21 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
                goto error;
        }
        if (tok->type == ISL_TOKEN_VALUE) {
+               struct isl_map *map;
                isl_stream_push_token(s, tok);
-               return map_read_polylib(s, nparam);
+               map = map_read_polylib(s, nparam);
+               if (!map)
+                       goto error;
+               if (isl_map_dim(map, isl_dim_in) > 0)
+                       obj.type = isl_obj_map;
+               obj.v = map;
+               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);
@@ -1042,7 +1729,7 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
                }
                isl_token_free(tok);
                tok = isl_stream_next_token(s);
-       } if (nparam > 0)
+       } else if (nparam > 0)
                bmap = isl_basic_map_add(bmap, isl_dim_param, nparam);
        if (!tok || tok->type != '{') {
                isl_stream_error(s, tok, "expecting '{'");
@@ -1052,9 +1739,45 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
        }
        isl_token_free(tok);
 
-       map = map_read_body(s, isl_basic_map_copy(bmap), v);
-
        tok = isl_stream_next_token(s);
+       if (!tok)
+               ;
+       else if (tok->type == ISL_TOKEN_IDENT && !strcmp(tok->u.s, "Sym")) {
+               isl_token_free(tok);
+               if (isl_stream_eat(s, '='))
+                       goto error;
+               bmap = read_tuple(s, bmap, isl_dim_param, v);
+               if (!bmap)
+                       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);
+               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 || !obj.v)
+                               goto error;
+               }
+               tok = isl_stream_next_token(s);
+               if (!tok || tok->type != ';')
+                       break;
+               isl_token_free(tok);
+       }
+
        if (tok && tok->type == '}') {
                isl_token_free(tok);
        } else {
@@ -1063,24 +1786,107 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
                        isl_token_free(tok);
                goto error;
        }
+done:
        vars_free(v);
        isl_basic_map_free(bmap);
 
-       return map;
+       return obj;
 error:
        isl_basic_map_free(bmap);
-       isl_map_free(map);
+       obj.type->free(obj.v);
        if (v)
                vars_free(v);
+       obj.v = NULL;
+       return obj;
+}
+
+struct isl_obj isl_stream_read_obj(struct isl_stream *s)
+{
+       return obj_read(s, -1);
+}
+
+__isl_give isl_map *isl_stream_read_map(struct isl_stream *s, int nparam)
+{
+       struct isl_obj obj;
+       struct isl_map *map;
+
+       obj = obj_read(s, nparam);
+       if (obj.v)
+               isl_assert(s->ctx, obj.type == isl_obj_map ||
+                                  obj.type == isl_obj_set, goto error);
+
+       return obj.v;
+error:
+       obj.type->free(obj.v);
+       return NULL;
+}
+
+__isl_give isl_set *isl_stream_read_set(struct isl_stream *s, int nparam)
+{
+       struct isl_obj obj;
+       struct isl_set *set;
+
+       obj = obj_read(s, nparam);
+       if (obj.v)
+               isl_assert(s->ctx, obj.type == isl_obj_set, goto error);
+
+       return obj.v;
+error:
+       obj.type->free(obj.v);
+       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;
        struct isl_map *map;
        struct isl_basic_map *bmap;
 
-       map = map_read(s, nparam);
+       obj = obj_read(s, nparam);
+       map = obj.v;
        if (!map)
                return NULL;
 
@@ -1158,7 +1964,7 @@ __isl_give isl_map *isl_map_read_from_file(struct isl_ctx *ctx,
        struct isl_stream *s = isl_stream_new_file(ctx, input);
        if (!s)
                return NULL;
-       map = map_read(s, nparam);
+       map = isl_stream_read_map(s, nparam);
        isl_stream_free(s);
        return map;
 }
@@ -1170,7 +1976,7 @@ __isl_give isl_map *isl_map_read_from_str(struct isl_ctx *ctx,
        struct isl_stream *s = isl_stream_new_str(ctx, str);
        if (!s)
                return NULL;
-       map = map_read(s, nparam);
+       map = isl_stream_read_map(s, nparam);
        isl_stream_free(s);
        return map;
 }
@@ -1203,58 +2009,110 @@ 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(
+       struct isl_stream *s)
+{
+       struct isl_obj obj;
+       struct isl_pw_qpolynomial *pwqp;
+
+       obj = obj_read(s, -1);
+       if (obj.v)
+               isl_assert(s->ctx, obj.type == isl_obj_pw_qpolynomial,
+                          goto error);
+
+       return obj.v;
+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;
 }