#include <isl_mat_private.h>
#include <isl_aff_private.h>
#include <isl/list.h>
+#include <isl_val_private.h>
struct variable {
char *name;
return NULL;
}
+/* Read an isl_val from "s".
+ *
+ * The following token sequences are recognized
+ *
+ * "infty" -> infty
+ * "-" "infty" -> -infty
+ * "NaN" -> NaN
+ * n "/" d -> n/d
+ * v -> v
+ *
+ * where n, d and v are integer constants.
+ */
+__isl_give isl_val *isl_stream_read_val(struct isl_stream *s)
+{
+ struct isl_token *tok = NULL;
+ struct isl_token *tok2 = NULL;
+ isl_val *val;
+
+ tok = next_token(s);
+ if (!tok) {
+ isl_stream_error(s, NULL, "unexpected EOF");
+ goto error;
+ }
+ if (tok->type == ISL_TOKEN_INFTY) {
+ isl_token_free(tok);
+ return isl_val_infty(s->ctx);
+ }
+ if (tok->type == '-' &&
+ isl_stream_eat_if_available(s, ISL_TOKEN_INFTY)) {
+ isl_token_free(tok);
+ return isl_val_neginfty(s->ctx);
+ }
+ if (tok->type == ISL_TOKEN_NAN) {
+ isl_token_free(tok);
+ return isl_val_nan(s->ctx);
+ }
+ if (tok->type != ISL_TOKEN_VALUE) {
+ isl_stream_error(s, tok, "expecting value");
+ goto error;
+ }
+
+ if (isl_stream_eat_if_available(s, '/')) {
+ tok2 = next_token(s);
+ if (!tok2) {
+ isl_stream_error(s, NULL, "unexpected EOF");
+ goto error;
+ }
+ if (tok2->type != ISL_TOKEN_VALUE) {
+ isl_stream_error(s, tok2, "expecting value");
+ goto error;
+ }
+ val = isl_val_rat_from_isl_int(s->ctx, tok->u.v, tok2->u.v);
+ val = isl_val_normalize(val);
+ } else {
+ val = isl_val_int_from_isl_int(s->ctx, tok->u.v);
+ }
+
+ isl_token_free(tok);
+ isl_token_free(tok2);
+ return val;
+error:
+ isl_token_free(tok);
+ isl_token_free(tok2);
+ return NULL;
+}
+
+/* Read an isl_val from "str".
+ */
+struct isl_val *isl_val_read_from_str(struct isl_ctx *ctx,
+ const char *str)
+{
+ isl_val *val;
+ struct isl_stream *s = isl_stream_new_str(ctx, str);
+ if (!s)
+ return NULL;
+ val = isl_stream_read_val(s);
+ isl_stream_free(s);
+ return val;
+}
+
static int accept_cst_factor(struct isl_stream *s, isl_int *f)
{
struct isl_token *tok;
if (pos < 0)
goto error;
if (pos >= n) {
+ vars_drop(v, v->n - n);
isl_stream_error(s, tok, "unknown identifier");
goto error;
}
}
static struct isl_map *read_disjuncts(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map);
+ struct vars *v, __isl_take isl_map *map, int rational);
static __isl_give isl_pw_aff *accept_extended_affine(struct isl_stream *s,
- __isl_take isl_space *dim, struct vars *v);
+ __isl_take isl_space *dim, struct vars *v, int rational);
/* Accept a ternary operator, given the first argument.
*/
static __isl_give isl_pw_aff *accept_ternary(struct isl_stream *s,
- __isl_take isl_map *cond, struct vars *v)
+ __isl_take isl_map *cond, struct vars *v, int rational)
{
isl_space *dim;
isl_pw_aff *pwaff1 = NULL, *pwaff2 = NULL, *pa_cond;
goto error;
dim = isl_space_wrap(isl_map_get_space(cond));
- pwaff1 = accept_extended_affine(s, dim, v);
+ pwaff1 = accept_extended_affine(s, dim, v, rational);
if (!pwaff1)
goto error;
goto error;
dim = isl_pw_aff_get_domain_space(pwaff1);
- pwaff2 = accept_extended_affine(s, dim, v);
+ pwaff2 = accept_extended_affine(s, dim, v, rational);
if (!pwaff1)
goto error;
* argument of a ternary operator and try to parse that.
*/
static __isl_give isl_pw_aff *accept_extended_affine(struct isl_stream *s,
- __isl_take isl_space *dim, struct vars *v)
+ __isl_take isl_space *dim, struct vars *v, int rational)
{
isl_space *space;
isl_map *cond;
}
pwaff = accept_affine(s, dim, v);
+ if (rational)
+ pwaff = isl_pw_aff_set_rational(pwaff);
if (!pwaff)
return NULL;
isl_stream_push_token(s, tok);
- cond = read_disjuncts(s, v, cond);
+ cond = read_disjuncts(s, v, cond, rational);
- return accept_ternary(s, cond, v);
+ return accept_ternary(s, cond, v, rational);
}
static __isl_give isl_map *read_var_def(struct isl_stream *s,
- __isl_take isl_map *map, enum isl_dim_type type, struct vars *v)
+ __isl_take isl_map *map, enum isl_dim_type type, struct vars *v,
+ int rational)
{
isl_pw_aff *def;
int pos;
}
--pos;
- def = accept_extended_affine(s, isl_space_wrap(isl_map_get_space(map)), v);
+ def = accept_extended_affine(s, isl_space_wrap(isl_map_get_space(map)),
+ v, rational);
def_map = isl_map_from_pw_aff(def);
def_map = isl_map_equate(def_map, type, pos, isl_dim_out, 0);
def_map = isl_set_unwrap(isl_map_domain(def_map));
list = isl_pw_aff_list_concat(list,
isl_pw_aff_list_from_pw_aff(pwaff));
if (!list)
- return NULL;
+ goto error;
}
isl_space_free(dim);
}
static __isl_give isl_map *read_defined_var_list(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
struct isl_token *tok;
tok = isl_stream_next_token(s);
if (tok && tok->type == '=') {
isl_token_free(tok);
- map = read_var_def(s, map, isl_dim_out, v);
+ map = read_var_def(s, map, isl_dim_out, v, rational);
tok = isl_stream_next_token(s);
}
* to "tuple".
*/
static __isl_give isl_multi_pw_aff *read_tuple_var_def(struct isl_stream *s,
- __isl_take isl_multi_pw_aff *tuple, int pos, struct vars *v)
+ __isl_take isl_multi_pw_aff *tuple, int pos, struct vars *v,
+ int rational)
{
isl_space *space;
isl_pw_aff *def;
space = isl_space_wrap(isl_space_alloc(s->ctx, 0, v->n, 0));
- def = accept_extended_affine(s, space, v);
+ def = accept_extended_affine(s, space, v, rational);
space = isl_space_set_alloc(s->ctx, 0, v->n);
def = isl_pw_aff_reset_domain_space(def, space);
tuple = isl_multi_pw_aff_set_pw_aff(tuple, pos, def);
/* Read a list of variables and/or affine expressions and return the list
* as an isl_multi_pw_aff.
* The elements in the list are separated by either "," or "][".
+ * If "comma" is set then only "," is allowed.
*/
static __isl_give isl_multi_pw_aff *read_tuple_var_list(struct isl_stream *s,
- struct vars *v)
+ struct vars *v, int rational, int comma)
{
int i = 0;
struct isl_token *tok;
new_name = p >= n;
}
- if (new_name) {
+ if (tok->type == '*') {
+ if (vars_add_anon(v) < 0)
+ goto error;
+ isl_token_free(tok);
+ } else if (new_name) {
res = tuple_set_dim_name(res, i, v->v->name);
isl_token_free(tok);
if (isl_stream_eat_if_available(s, '='))
- res = read_tuple_var_def(s, res, i, v);
+ res = read_tuple_var_def(s, res, i, v,
+ rational);
} else {
isl_stream_push_token(s, tok);
tok = NULL;
if (vars_add_anon(v) < 0)
goto error;
- res = read_tuple_var_def(s, res, i, v);
+ res = read_tuple_var_def(s, res, i, v, rational);
}
tok = isl_stream_next_token(s);
- if (tok && tok->type == ']' &&
+ if (!comma && tok && tok->type == ']' &&
isl_stream_next_token_is(s, '[')) {
isl_token_free(tok);
tok = isl_stream_next_token(s);
/* Read a tuple and represent it as an isl_multi_pw_aff. See tuple_alloc.
*/
static __isl_give isl_multi_pw_aff *read_tuple(struct isl_stream *s,
- struct vars *v)
+ struct vars *v, int rational, int comma)
{
struct isl_token *tok;
char *name = NULL;
if (next_is_tuple(s)) {
isl_multi_pw_aff *out;
int n;
- res = read_tuple(s, v);
+ res = read_tuple(s, v, rational, comma);
if (isl_stream_eat(s, ISL_TOKEN_TO))
goto error;
- out = read_tuple(s, v);
+ out = read_tuple(s, v, rational, comma);
n = isl_multi_pw_aff_dim(out, isl_dim_out);
res = isl_multi_pw_aff_add_dims(res, isl_dim_in, n);
res = isl_multi_pw_aff_range_product(res, out);
} else
- res = read_tuple_var_list(s, v);
+ res = read_tuple_var_list(s, v, rational, comma);
if (isl_stream_eat(s, ']'))
goto error;
* however, so we first need to reset the space to that of "map".
*/
static __isl_give isl_map *read_map_tuple(struct isl_stream *s,
- __isl_take isl_map *map, enum isl_dim_type type, struct vars *v)
+ __isl_take isl_map *map, enum isl_dim_type type, struct vars *v,
+ int rational, int comma)
{
int i, n;
isl_multi_pw_aff *tuple;
isl_space *space = NULL;
- tuple = read_tuple(s, v);
+ tuple = read_tuple(s, v, rational, comma);
if (!tuple)
goto error;
n = isl_multi_pw_aff_dim(tuple, isl_dim_out);
space = isl_space_range(isl_multi_pw_aff_get_space(tuple));
+ if (!space)
+ goto error;
if (type == isl_dim_param) {
if (isl_space_has_tuple_name(space, isl_dim_set) ||
isl_set *set;
set = isl_set_universe(isl_space_copy(space));
+ if (rational)
+ set = isl_set_set_rational(set);
set = isl_set_intersect_params(set, isl_map_params(map));
map = isl_map_from_domain(set);
} else {
isl_set *set;
set = isl_set_universe(isl_space_copy(space));
+ if (rational)
+ set = isl_set_set_rational(set);
map = isl_map_from_domain_and_range(isl_map_domain(map), set);
}
aff = isl_aff_add_coefficient_si(aff,
isl_dim_in, v->n - n + i, -1);
pa = isl_pw_aff_add(pa, isl_pw_aff_from_aff(aff));
+ if (rational)
+ pa = isl_pw_aff_set_rational(pa);
set = isl_pw_aff_zero_set(pa);
map_i = isl_map_from_range(set);
map_i = isl_map_reset_space(map_i, isl_map_get_space(map));
static __isl_give isl_set *construct_constraints(
__isl_take isl_set *set, int type,
- __isl_keep isl_pw_aff_list *left, __isl_keep isl_pw_aff_list *right)
+ __isl_keep isl_pw_aff_list *left, __isl_keep isl_pw_aff_list *right,
+ int rational)
{
isl_set *cond;
+ left = isl_pw_aff_list_copy(left);
+ right = isl_pw_aff_list_copy(right);
+ if (rational) {
+ left = isl_pw_aff_list_set_rational(left);
+ right = isl_pw_aff_list_set_rational(right);
+ }
if (type == ISL_TOKEN_LE)
- cond = isl_pw_aff_list_le_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_le_set(left, right);
else if (type == ISL_TOKEN_GE)
- cond = isl_pw_aff_list_ge_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_ge_set(left, right);
else if (type == ISL_TOKEN_LT)
- cond = isl_pw_aff_list_lt_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_lt_set(left, right);
else if (type == ISL_TOKEN_GT)
- cond = isl_pw_aff_list_gt_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_gt_set(left, right);
else if (type == ISL_TOKEN_NE)
- cond = isl_pw_aff_list_ne_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_ne_set(left, right);
else
- cond = isl_pw_aff_list_eq_set(isl_pw_aff_list_copy(left),
- isl_pw_aff_list_copy(right));
+ cond = isl_pw_aff_list_eq_set(left, right);
return isl_set_intersect(set, cond);
}
static __isl_give isl_map *add_constraint(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
struct isl_token *tok = NULL;
isl_pw_aff_list *list1 = NULL, *list2 = NULL;
if (!list2)
goto error;
- set = construct_constraints(set, tok->type, list1, list2);
+ set = construct_constraints(set, tok->type, list1, list2,
+ rational);
isl_token_free(tok);
isl_pw_aff_list_free(list1);
list1 = list2;
}
static __isl_give isl_map *read_exists(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
int n = v->n;
int seen_paren = isl_stream_eat_if_available(s, '(');
map = isl_map_from_domain(isl_map_wrap(map));
- map = read_defined_var_list(s, v, map);
+ map = read_defined_var_list(s, v, map, rational);
if (isl_stream_eat(s, ':'))
goto error;
- map = read_disjuncts(s, v, map);
+ map = read_disjuncts(s, v, map, rational);
map = isl_set_unwrap(isl_map_domain(map));
vars_drop(v, v->n - n);
* start of a condition and continue parsing.
*/
static int resolve_paren_expr(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
struct isl_token *tok, *tok2;
int line, col;
goto error;
if (isl_stream_next_token_is(s, '('))
- if (resolve_paren_expr(s, v, isl_map_copy(map)))
+ if (resolve_paren_expr(s, v, isl_map_copy(map), rational))
goto error;
if (isl_stream_next_token_is(s, ISL_TOKEN_EXISTS) ||
isl_stream_next_token_is(s, ISL_TOKEN_TRUE) ||
isl_stream_next_token_is(s, ISL_TOKEN_FALSE) ||
isl_stream_next_token_is(s, ISL_TOKEN_MAP)) {
- map = read_disjuncts(s, v, map);
+ map = read_disjuncts(s, v, map, rational);
if (isl_stream_eat(s, ')'))
goto error;
tok->type = ISL_TOKEN_MAP;
isl_stream_push_token(s, tok2);
- map = read_disjuncts(s, v, map);
+ map = read_disjuncts(s, v, map, rational);
if (isl_stream_eat(s, ')'))
goto error;
}
static __isl_give isl_map *read_conjunct(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
if (isl_stream_next_token_is(s, '('))
- if (resolve_paren_expr(s, v, isl_map_copy(map)))
+ if (resolve_paren_expr(s, v, isl_map_copy(map), rational))
goto error;
if (isl_stream_next_token_is(s, ISL_TOKEN_MAP)) {
}
if (isl_stream_eat_if_available(s, ISL_TOKEN_EXISTS))
- return read_exists(s, v, map);
+ return read_exists(s, v, map, rational);
if (isl_stream_eat_if_available(s, ISL_TOKEN_TRUE))
return map;
return isl_map_empty(dim);
}
- return add_constraint(s, v, map);
+ return add_constraint(s, v, map, rational);
error:
isl_map_free(map);
return NULL;
}
static __isl_give isl_map *read_conjuncts(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
isl_map *res;
int negate;
negate = isl_stream_eat_if_available(s, ISL_TOKEN_NOT);
- res = read_conjunct(s, v, isl_map_copy(map));
+ res = read_conjunct(s, v, isl_map_copy(map), rational);
if (negate)
res = isl_map_subtract(isl_map_copy(map), res);
- while (isl_stream_eat_if_available(s, ISL_TOKEN_AND)) {
+ while (res && isl_stream_eat_if_available(s, ISL_TOKEN_AND)) {
isl_map *res_i;
negate = isl_stream_eat_if_available(s, ISL_TOKEN_NOT);
- res_i = read_conjunct(s, v, isl_map_copy(map));
+ res_i = read_conjunct(s, v, isl_map_copy(map), rational);
if (negate)
res = isl_map_subtract(res, res_i);
else
}
static struct isl_map *read_disjuncts(struct isl_stream *s,
- struct vars *v, __isl_take isl_map *map)
+ struct vars *v, __isl_take isl_map *map, int rational)
{
isl_map *res;
return isl_map_universe(dim);
}
- res = read_conjuncts(s, v, isl_map_copy(map));
+ res = read_conjuncts(s, v, isl_map_copy(map), rational);
while (isl_stream_eat_if_available(s, ISL_TOKEN_OR)) {
isl_map *res_i;
- res_i = read_conjuncts(s, v, isl_map_copy(map));
+ res_i = read_conjuncts(s, v, isl_map_copy(map), rational);
res = isl_map_union(res, res_i);
}
pwqp = isl_pw_qpolynomial_pow(pwqp, pow);
} else if (tok->type == ISL_TOKEN_VALUE) {
struct isl_token *tok2;
- tok2 = isl_stream_next_token(s);
isl_qpolynomial *qp;
+
+ tok2 = isl_stream_next_token(s);
if (tok2 && tok2->type == '/') {
isl_token_free(tok2);
tok2 = next_token(s);
}
static __isl_give isl_map *read_optional_disjuncts(struct isl_stream *s,
- __isl_take isl_map *map, struct vars *v)
+ __isl_take isl_map *map, struct vars *v, int rational)
{
struct isl_token *tok;
if (tok->type == ':' ||
(tok->type == ISL_TOKEN_OR && !strcmp(tok->u.s, "|"))) {
isl_token_free(tok);
- map = read_disjuncts(s, v, map);
+ map = read_disjuncts(s, v, map, rational);
} else
isl_stream_push_token(s, tok);
struct isl_set *set;
pwqp = read_term(s, map, v);
- map = read_optional_disjuncts(s, map, v);
+ map = read_optional_disjuncts(s, map, v, 0);
set = isl_map_range(map);
pwqp = isl_pw_qpolynomial_intersect_domain(pwqp, set);
if (isl_stream_eat(s, ')'))
goto error;
- set = read_optional_disjuncts(s, set, v);
+ set = read_optional_disjuncts(s, set, v, 0);
pwf = isl_pw_qpolynomial_fold_intersect_domain(pwf, set);
vars_drop(v, v->n - n);
struct isl_token *tok;
struct isl_obj obj = { isl_obj_set, NULL };
int n = v->n;
+ int rational;
- if (is_rational(s))
+ rational = is_rational(s);
+ if (rational)
map = isl_map_set_rational(map);
if (isl_stream_next_token_is(s, ':')) {
obj.type = isl_obj_set;
- obj.v = read_optional_disjuncts(s, map, v);
+ obj.v = read_optional_disjuncts(s, map, v, rational);
return obj;
}
if (!next_is_tuple(s))
return obj_read_poly_or_fold(s, map, v, n);
- map = read_map_tuple(s, map, isl_dim_in, v);
+ map = read_map_tuple(s, map, isl_dim_in, v, rational, 0);
if (!map)
goto error;
tok = isl_stream_next_token(s);
isl_set *set = isl_map_domain(map);
return obj_read_poly_or_fold(s, set, v, n);
}
- map = read_map_tuple(s, map, isl_dim_out, v);
+ map = read_map_tuple(s, map, isl_dim_out, v, rational, 0);
if (!map)
goto error;
} else {
isl_stream_push_token(s, tok);
}
- map = read_optional_disjuncts(s, map, v);
+ map = read_optional_disjuncts(s, map, v, rational);
vars_drop(v, v->n - n);
map = isl_map_universe(isl_space_params_alloc(s->ctx, 0));
if (tok->type == '[') {
isl_stream_push_token(s, tok);
- map = read_map_tuple(s, map, isl_dim_param, v);
+ map = read_map_tuple(s, map, isl_dim_param, v, 0, 0);
if (!map)
goto error;
tok = isl_stream_next_token(s);
isl_token_free(tok);
if (isl_stream_eat(s, '='))
goto error;
- map = read_map_tuple(s, map, isl_dim_param, v);
+ map = read_map_tuple(s, map, isl_dim_param, v, 0, 1);
if (!map)
goto error;
} else if (tok->type == '}') {
return pwqp;
}
-/* Read an affine expression from "s" with domain (space) "dom".
- * We call accept_affine to parse a possibly piecewise affine expression
- * and then check that the result is a single affine expression on
- * a universe domain.
- */
-static __isl_give isl_aff *read_aff_with_dom(struct isl_stream *s,
- __isl_take isl_set *dom, struct vars *v)
-{
- isl_aff *aff = NULL;
- isl_pw_aff *pwaff = NULL;
-
- if (!isl_set_plain_is_universe(dom))
- isl_die(s->ctx, isl_error_invalid,
- "expecting universe domain", goto error);
-
- if (!isl_set_is_params(dom) && isl_stream_eat(s, ISL_TOKEN_TO))
- goto error;
-
- if (isl_stream_eat(s, '['))
- goto error;
-
- pwaff = accept_affine(s, isl_set_get_space(dom), v);
-
- if (isl_stream_eat(s, ']'))
- goto error;
- if (isl_stream_eat(s, '}'))
- goto error;
-
- if (!pwaff)
- goto error;
-
- if (pwaff->n != 1)
- isl_die(s->ctx, isl_error_invalid,
- "expecting single affine expression", goto error);
- if (!isl_set_plain_is_universe(pwaff->p[0].set))
- isl_die(s->ctx, isl_error_invalid,
- "expecting universe domain", goto error);
-
- aff = isl_aff_copy(pwaff->p[0].aff);
-
- vars_free(v);
- isl_pw_aff_free(pwaff);
- isl_set_free(dom);
- return aff;
-error:
- vars_free(v);
- isl_pw_aff_free(pwaff);
- isl_set_free(dom);
- return NULL;
-}
-
/* Is the next token an identifer not in "v"?
*/
static int next_is_fresh_ident(struct isl_stream *s, struct vars *v)
tok = isl_stream_next_token(s);
if (tok && (tok->type == ISL_TOKEN_IDENT || tok->is_keyword)) {
isl_stream_push_token(s, tok);
- return read_map_tuple(s, dom, isl_dim_set, v);
+ return read_map_tuple(s, dom, isl_dim_set, v, 1, 0);
}
if (!tok || tok->type != '[') {
isl_stream_error(s, tok, "expecting '['");
}
if (next_is_tuple(s) || next_is_fresh_ident(s, v)) {
isl_stream_push_token(s, tok);
- dom = read_map_tuple(s, dom, isl_dim_set, v);
+ dom = read_map_tuple(s, dom, isl_dim_set, v, 1, 0);
} else
isl_stream_push_token(s, tok);
error:
if (tok)
isl_stream_push_token(s, tok);
- vars_free(v);
isl_set_free(dom);
return NULL;
}
/* Read an affine expression from "s".
- * We first read the domain of the affine expression, which may be
- * a parameter space or a set, and then call read_aff_with_dom.
*/
__isl_give isl_aff *isl_stream_read_aff(struct isl_stream *s)
{
- struct vars *v;
- isl_set *dom = NULL;
+ isl_aff *aff;
+ isl_multi_aff *ma;
- v = vars_new(s->ctx);
- if (!v)
+ ma = isl_stream_read_multi_aff(s);
+ if (!ma)
return NULL;
+ if (isl_multi_aff_dim(ma, isl_dim_out) != 1)
+ isl_die(s->ctx, isl_error_invalid,
+ "expecting single affine expression",
+ goto error);
- dom = isl_set_universe(isl_space_params_alloc(s->ctx, 0));
- if (next_is_tuple(s)) {
- dom = read_map_tuple(s, dom, isl_dim_param, v);
- if (isl_stream_eat(s, ISL_TOKEN_TO))
- goto error;
- }
- if (isl_stream_eat(s, '{'))
- goto error;
-
- dom = read_aff_domain(s, dom, v);
- return read_aff_with_dom(s, dom, v);
+ aff = isl_multi_aff_get_aff(ma, 0);
+ isl_multi_aff_free(ma);
+ return aff;
error:
- vars_free(v);
- isl_set_free(dom);
+ isl_multi_aff_free(ma);
return NULL;
}
if (isl_stream_eat(s, ']'))
goto error;
- dom = read_optional_disjuncts(s, dom, v);
+ dom = read_optional_disjuncts(s, dom, v, 0);
pwaff = isl_pw_aff_intersect_domain(pwaff, dom);
return pwaff;
dom = isl_set_universe(isl_space_params_alloc(s->ctx, 0));
if (next_is_tuple(s)) {
- dom = read_map_tuple(s, dom, isl_dim_param, v);
+ dom = read_map_tuple(s, dom, isl_dim_param, v, 1, 0);
if (isl_stream_eat(s, ISL_TOKEN_TO))
goto error;
}
return pma;
}
+/* Read an isl_union_pw_multi_aff from "s".
+ * We currently read a generic object and if it turns out to be a set or
+ * a map, we convert that to an isl_union_pw_multi_aff.
+ * It would be more efficient if we were to construct
+ * the isl_union_pw_multi_aff directly.
+ */
+__isl_give isl_union_pw_multi_aff *isl_stream_read_union_pw_multi_aff(
+ struct isl_stream *s)
+{
+ struct isl_obj obj;
+
+ obj = obj_read(s);
+ if (!obj.v)
+ return NULL;
+
+ if (obj.type == isl_obj_map || obj.type == isl_obj_set)
+ obj = to_union(s->ctx, obj);
+ if (obj.type == isl_obj_union_map)
+ return isl_union_pw_multi_aff_from_union_map(obj.v);
+ if (obj.type == isl_obj_union_set)
+ return isl_union_pw_multi_aff_from_union_set(obj.v);
+
+ obj.type->free(obj.v);
+ isl_die(s->ctx, isl_error_invalid, "unexpected object type",
+ return NULL);
+}
+
+/* Read an isl_union_pw_multi_aff from "str".
+ */
+__isl_give isl_union_pw_multi_aff *isl_union_pw_multi_aff_read_from_str(
+ isl_ctx *ctx, const char *str)
+{
+ isl_union_pw_multi_aff *upma;
+ struct isl_stream *s = isl_stream_new_str(ctx, str);
+ if (!s)
+ return NULL;
+ upma = isl_stream_read_union_pw_multi_aff(s);
+ isl_stream_free(s);
+ return upma;
+}
+
/* Assuming "pa" represents a single affine expression defined on a universe
* domain, extract this affine expression.
*/
dom = isl_set_universe(isl_space_params_alloc(s->ctx, 0));
if (next_is_tuple(s)) {
- dom = read_map_tuple(s, dom, isl_dim_param, v);
+ dom = read_map_tuple(s, dom, isl_dim_param, v, 1, 0);
if (isl_stream_eat(s, ISL_TOKEN_TO))
goto error;
}
if (isl_stream_eat(s, '{'))
goto error;
- tuple = read_tuple(s, v);
+ tuple = read_tuple(s, v, 0, 0);
if (!tuple)
goto error;
if (isl_stream_eat_if_available(s, ISL_TOKEN_TO)) {
set = isl_set_universe(space);
dom = isl_set_intersect_params(set, dom);
isl_multi_pw_aff_free(tuple);
- tuple = read_tuple(s, v);
+ tuple = read_tuple(s, v, 0, 0);
if (!tuple)
goto error;
}
projects / platform / upstream / isl.git / blobdiff