Merge branch 'maint'

diff --cc isl_aff.c
Simple merge

diff --cc isl_map.c
Simple merge

diff --cc isl_test.c
Simple merge

diff --cc isl_union_templ.c
index 7f5c2ae,30e7f3b..498badf
--- 1/isl_union_templ.c
--- 2/isl_union_templ.c
+++ b/isl_union_templ.c
@@@ -415,88 -415,7 +415,88 @@@ error
        return NULL;
  }
  
- S(UNION,match_set_data) {
 +S(UNION,any_set_data) {
 +      isl_set *set;
 +      UNION *res;
 +      __isl_give PW *(*fn)(__isl_take PW*, __isl_take isl_set*);
 +};
 +
 +static int any_set_entry(void **entry, void *user)
 +{
 +      S(UNION,any_set_data) *data = user;
 +      PW *pw = *entry;
 +      int empty;
 +
 +      pw = FN(PW,copy)(pw);
 +      pw = data->fn(pw, isl_set_copy(data->set));
 +
 +      empty = FN(PW,is_zero)(pw);
 +      if (empty < 0) {
 +              FN(PW,free)(pw);
 +              return -1;
 +      }
 +      if (empty) {
 +              FN(PW,free)(pw);
 +              return 0;
 +      }
 +
 +      data->res = FN(FN(UNION,add),PARTS)(data->res, pw);
 +
 +      return 0;
 +}
 +
 +/* Update each element of "u" by calling "fn" on the element and "set".
 + */
 +static __isl_give UNION *any_set_op(__isl_take UNION *u,
 +      __isl_take isl_set *set,
 +      __isl_give PW *(*fn)(__isl_take PW*, __isl_take isl_set*))
 +{
 +      S(UNION,any_set_data) data = { NULL, NULL, fn };
 +
 +      u = FN(UNION,align_params)(u, isl_set_get_space(set));
 +      set = isl_set_align_params(set, FN(UNION,get_space)(u));
 +
 +      if (!u || !set)
 +              goto error;
 +
 +      data.set = set;
 +#ifdef HAS_TYPE
 +      data.res = FN(UNION,alloc)(isl_space_copy(u->dim), u->type, u->table.n);
 +#else
 +      data.res = FN(UNION,alloc)(isl_space_copy(u->dim), u->table.n);
 +#endif
 +      if (isl_hash_table_foreach(u->dim->ctx, &u->table,
 +                                 &any_set_entry, &data) < 0)
 +              goto error;
 +
 +      FN(UNION,free)(u);
 +      isl_set_free(set);
 +      return data.res;
 +error:
 +      FN(UNION,free)(u);
 +      isl_set_free(set);
 +      FN(UNION,free)(data.res);
 +      return NULL;
 +}
 +
 +/* Intersect the domain of "u" with the parameter domain "context".
 + */
 +__isl_give UNION *FN(UNION,intersect_params)(__isl_take UNION *u,
 +      __isl_take isl_set *set)
 +{
 +      return any_set_op(u, set, &FN(PW,intersect_params));
 +}
 +
 +/* Compute the gist of the domain of "u" with respect to
 + * the parameter domain "context".
 + */
 +__isl_give UNION *FN(UNION,gist_params)(__isl_take UNION *u,
 +      __isl_take isl_set *set)
 +{
 +      return any_set_op(u, set, &FN(PW,gist_params));
 +}
 +
+ S(UNION,match_domain_data) {
        isl_union_set *uset;
        UNION *res;
        __isl_give PW *(*fn)(__isl_take PW*, __isl_take isl_set*);
@@@ -581,18 -507,13 +592,18 @@@ error
  __isl_give UNION *FN(UNION,intersect_domain)(__isl_take UNION *u,
        __isl_take isl_union_set *uset)
  {
-       return match_set_op(u, uset, &FN(PW,intersect_domain));
 +      if (isl_union_set_is_params(uset))
 +              return FN(UNION,intersect_params)(u,
 +                                              isl_set_from_union_set(uset));
+       return match_domain_op(u, uset, &FN(PW,intersect_domain));
  }
  
  __isl_give UNION *FN(UNION,gist)(__isl_take UNION *u,
        __isl_take isl_union_set *uset)
  {
-       return match_set_op(u, uset, &FN(PW,gist));
 +      if (isl_union_set_is_params(uset))
 +              return FN(UNION,gist_params)(u, isl_set_from_union_set(uset));
+       return match_domain_op(u, uset, &FN(PW,gist));
  }
  
  __isl_give isl_qpolynomial *FN(UNION,eval)(__isl_take UNION *u,