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)
-{
- int i = 0;
- struct isl_token *tok;
-
- while ((tok = isl_stream_next_token(s)) != NULL) {
- int p;
- int n = v->n;
-
- if (tok->type != ISL_TOKEN_IDENT)
- break;
-
- p = vars_pos(v, tok->u.s, -1);
- if (p < 0)
- goto error;
- if (p < n) {
- isl_stream_error(s, tok, "expecting unique identifier");
- goto error;
- }
- isl_token_free(tok);
-
- bmap = isl_basic_map_add(bmap, type, 1);
- bmap = set_name(bmap, type, i++, v->v->name);
-
- tok = isl_stream_next_token(s);
- if (!tok || tok->type != ',')
- break;
-
- isl_token_free(tok);
- }
- if (tok)
- isl_stream_push_token(s, tok);
-
- return bmap;
-error:
- isl_token_free(tok);
- isl_basic_map_free(bmap);
- return NULL;
-}
-
static struct isl_vec *accept_affine(struct isl_stream *s, struct vars *v)
{
struct isl_token *tok = NULL;
goto error;
if (pos >= n) {
isl_stream_error(s, tok, "unknown identifier");
+ isl_token_free(tok);
goto error;
}
if (sign > 0)
if (pos >= n) {
isl_stream_error(s, tok2,
"unknown identifier");
+ isl_token_free(tok);
isl_token_free(tok2);
goto error;
}
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)
+{
+ int i = 0;
+ struct isl_token *tok;
+
+ while ((tok = isl_stream_next_token(s)) != NULL) {
+ int new_name = 0;
+
+ if (tok->type == ISL_TOKEN_IDENT) {
+ int n = v->n;
+ int p = vars_pos(v, tok->u.s, -1);
+ if (p < 0)
+ goto error;
+ new_name = p >= n;
+ }
+
+ if (new_name) {
+ bmap = isl_basic_map_add(bmap, type, 1);
+ 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;
+ if (type == isl_dim_param) {
+ isl_stream_error(s, tok,
+ "expecting unique identifier");
+ goto error;
+ }
+ 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;
+ } else
+ break;
+
+ tok = isl_stream_next_token(s);
+ if (!tok || tok->type != ',')
+ break;
+
+ isl_token_free(tok);
+ i++;
+ }
+ if (tok)
+ isl_stream_push_token(s, tok);
+
+ return bmap;
+error:
+ isl_token_free(tok);
+ isl_basic_map_free(bmap);
+ return NULL;
+}
+
static __isl_give isl_mat *accept_affine_list(struct isl_stream *s,
struct vars *v)
{
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;
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) {
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);
n = isl_int_get_si(tok->u.v);
isl_token_free(tok);
return map;
}
+static struct isl_map *map_read_body(struct isl_stream *s,
+ __isl_take isl_basic_map *bmap, struct vars *v)
+{
+ struct isl_map *map = NULL;
+ 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);
+ }
+ tok = isl_stream_next_token(s);
+ if (!tok) {
+ isl_stream_error(s, NULL, "unexpected EOF");
+ goto error;
+ }
+ map = isl_map_from_basic_map(isl_basic_map_copy(bmap));
+ if (tok->type == ':') {
+ isl_token_free(tok);
+ map = isl_map_intersect(map,
+ read_disjuncts(s, v, isl_basic_map_get_dim(bmap)));
+ } 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)
{
struct isl_basic_map *bmap = NULL;
goto error;
}
isl_token_free(tok);
- 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);
- }
- tok = isl_stream_next_token(s);
- if (!tok) {
- isl_stream_error(s, NULL, "unexpected EOF");
- goto error;
- }
- map = isl_map_from_basic_map(isl_basic_map_copy(bmap));
- if (tok->type == ':') {
- isl_token_free(tok);
- map = isl_map_intersect(map,
- read_disjuncts(s, v, isl_basic_map_get_dim(bmap)));
+
+ for (;;) {
+ isl_map *m = map_read_body(s, isl_basic_map_copy(bmap), v);
+ if (!m)
+ break;
+ if (map)
+ map = isl_map_union(map, m);
+ else
+ map = m;
tok = isl_stream_next_token(s);
+ if (!tok || tok->type != ';')
+ break;
+ isl_token_free(tok);
}
+
if (tok && tok->type == '}') {
isl_token_free(tok);
} else {
projects / platform / upstream / isl.git / blobdiff