isl_convex_hull.c: modulo_affine_hull: drop redundant argument
[platform/upstream/isl.git] / isl_input.c
index c6ca654..9d9788f 100644 (file)
 #include <strings.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"
 
 struct variable {
        char                    *name;
@@ -170,6 +173,7 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
                                goto error;
                        if (pos >= n) {
                                isl_stream_error(s, tok, "unknown identifier");
+                               isl_token_free(tok);
                                goto error;
                        }
                        if (sign > 0)
@@ -183,6 +187,11 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
                        struct isl_token *tok2;
                        int n = v->n;
                        int pos = -1;
+                       if (isl_stream_eat_if_available(s, '*') &&
+                           !isl_stream_next_token_is(s, ISL_TOKEN_IDENT)) {
+                               isl_stream_error(s, NULL, "missing identifier");
+                               goto error;
+                       }
                        tok2 = isl_stream_next_token(s);
                        if (tok2 && tok2->type == ISL_TOKEN_IDENT) {
                                pos = vars_pos(v, tok2->u.s, -1);
@@ -191,6 +200,7 @@ static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
                                if (pos >= n) {
                                        isl_stream_error(s, tok2,
                                                "unknown identifier");
+                                       isl_token_free(tok);
                                        isl_token_free(tok2);
                                        goto error;
                                }
@@ -966,27 +976,198 @@ static struct isl_map *map_read_polylib(struct isl_stream *s, int 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)
+       tok = isl_stream_next_token(s);
+       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_keep isl_basic_map *bmap, struct vars *v)
+{
+       unsigned total = isl_basic_map_total_dim(bmap);
+       int k;
+
+       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);
+
+       if ((k = isl_basic_map_alloc_div(bmap)) < 0)
                goto error;
+       isl_seq_clr(bmap->div[k], 1 + 1 + total);
+       bmap = add_div_definition(s, v, bmap, k);
+
+       return isl_basic_map_div(bmap, k);
+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 && tok->type == ISL_TOKEN_TO) {
+       if (!tok) {
+               isl_stream_error(s, NULL, "unexpected EOF");
+               return NULL;
+       }
+       if (tok->type == '(') {
                isl_token_free(tok);
-               bmap = read_tuple(s, bmap, isl_dim_out, v);
-               if (!bmap)
+               qp = read_term(s, bmap, v);
+               if (!qp)
+                       return NULL;
+               if (isl_stream_eat(s, ')'))
                        goto error;
+       } 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;
+               isl_token_free(tok);
+               if (pos < 0)
+                       goto error;
+               if (pos >= n) {
+                       isl_stream_error(s, tok, "unknown identifier");
+                       return NULL;
+               }
+               pow = optional_power(s);
+               qp = isl_qpolynomial_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);
+               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 {
-               bmap = isl_basic_map_reverse(bmap);
-               if (tok)
+               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;
+
+                       qp2 = isl_qpolynomial_cst(isl_basic_map_get_dim(bmap),
+                                                       tok->u.v);
+                       isl_token_free(tok);
+                       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");
@@ -1000,21 +1181,102 @@ 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;
+
+       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);
+
+       pwqp = isl_pw_qpolynomial_alloc(set, qp);
+
+       vars_drop(v, v->n - n);
+
+       obj.v = pwqp;
+       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)
 {
-       struct isl_basic_map *bmap = NULL;
        struct isl_map *map = NULL;
        struct isl_token *tok;
+       struct isl_obj obj = { type, NULL };
+       int n = v->n;
+
+       if (!isl_stream_next_token_is(s, '['))
+               return obj_read_poly(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);
+               tok = isl_stream_next_token(s);
+               if (tok && tok->type != '[') {
+                       isl_stream_push_token(s, tok);
+                       return obj_read_poly(s, bmap, v, n);
+               }
+               isl_stream_push_token(s, 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);
+       }
+
+       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 obj_add(struct isl_ctx *ctx,
+       struct isl_obj obj1, struct isl_obj obj2)
+{
+       isl_assert(ctx, obj1.type == obj2.type, goto error);
+       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)
+{
+       struct 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) {
@@ -1022,8 +1284,15 @@ 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);
        bmap = isl_basic_map_alloc(s->ctx, 0, 0, 0, 0, 0, 0);
@@ -1054,13 +1323,18 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
        isl_token_free(tok);
 
        for (;;) {
-               isl_map *m = map_read_body(s, isl_basic_map_copy(bmap), v);
-               if (!m)
+               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;
-               if (map)
-                       map = isl_map_union(map, m);
-               else
-                       map = m;
+               if (!obj.v)
+                       obj = o;
+               else {
+                       obj = obj_add(s->ctx, obj, o);
+                       if (obj.type == isl_obj_none)
+                               break;
+               }
                tok = isl_stream_next_token(s);
                if (!tok || tok->type != ';')
                        break;
@@ -1078,21 +1352,45 @@ static struct isl_map *map_read(struct isl_stream *s, int nparam)
        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;
 }
 
 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;
 
@@ -1170,7 +1468,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;
 }
@@ -1182,7 +1480,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;
 }