isl_{basic_,}set_preimage: drop ctx argument

diff --git a/isl_affine_hull.c b/isl_affine_hull.c
index 5635b71..cd991cc 100644 (file)
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
@@ -368,7 +368,7 @@ static struct isl_basic_set *equalities_in_underlying_set(
        }
        isl_basic_set_free(bset);
        if (T2)
-               hull = isl_basic_set_preimage(ctx, hull, T2);
+               hull = isl_basic_set_preimage(hull, T2);
 
        return hull;
 error:

diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index d978108..ad0cdd0 100644 (file)
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -504,7 +504,7 @@ static isl_int *wrap_facet(struct isl_ctx *ctx, struct isl_set *set,
        isl_seq_cpy(T->row[1], facet, dim);
        isl_seq_cpy(T->row[2], ridge, dim);
        T = isl_mat_right_inverse(ctx, T);
-       set = isl_set_preimage(ctx, set, T);
+       set = isl_set_preimage(set, T);
        T = NULL;
        if (!set)
                goto error;
@@ -667,9 +667,9 @@ static struct isl_basic_set *compute_facet(struct isl_ctx *ctx,
        Q = isl_mat_right_inverse(ctx, isl_mat_copy(ctx, U));
        U = isl_mat_drop_cols(ctx, U, 1, 1);
        Q = isl_mat_drop_rows(ctx, Q, 1, 1);
-       set = isl_set_preimage(ctx, set, U);
+       set = isl_set_preimage(set, U);
        facet = uset_convex_hull_wrap(set);
-       facet = isl_basic_set_preimage(ctx, facet, Q);
+       facet = isl_basic_set_preimage(facet, Q);
        return facet;
 error:
        isl_set_free(set);
@@ -1124,9 +1124,9 @@ static struct isl_basic_set *modulo_affine_hull(struct isl_ctx *ctx,
        if (!dummy)
                goto error;
        isl_basic_set_free(dummy);
-       set = isl_set_preimage(ctx, set, T);
+       set = isl_set_preimage(set, T);
        convex_hull = uset_convex_hull(set);
-       convex_hull = isl_basic_set_preimage(ctx, convex_hull, T2);
+       convex_hull = isl_basic_set_preimage(convex_hull, T2);
        convex_hull = isl_basic_set_intersect(convex_hull, affine_hull);
        return convex_hull;
 error:

diff --git a/isl_equalities.c b/isl_equalities.c
index 2b3ed9c..67fe05f 100644 (file)
--- a/isl_equalities.c
+++ b/isl_equalities.c
@@ -543,7 +543,7 @@ static struct isl_basic_set *compress_variables(struct isl_ctx *ctx,
                return isl_basic_set_set_to_empty(bset);
        }
 
-       bset = isl_basic_set_preimage(ctx, bset, T ? isl_mat_copy(ctx, TC) : TC);
+       bset = isl_basic_set_preimage(bset, T ? isl_mat_copy(ctx, TC) : TC);
        if (T)
                *T = TC;
        return bset;

diff --git a/isl_map_simplify.c b/isl_map_simplify.c
index fb2c5fc..0920d8a 100644 (file)
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
@@ -1284,9 +1284,9 @@ static struct isl_basic_set *uset_gist_context_eq(struct isl_basic_set *bset,
                                isl_basic_set_copy(context), &T, &T2);
        if (!reduced_context)
                goto error;
-       bset = isl_basic_set_preimage(ctx, bset, T);
+       bset = isl_basic_set_preimage(bset, T);
        bset = uset_gist(bset, reduced_context);
-       bset = isl_basic_set_preimage(ctx, bset, T2);
+       bset = isl_basic_set_preimage(bset, T2);
        bset = isl_basic_set_reduce_using_equalities(bset, context);
        return bset;
 error:
@@ -1312,9 +1312,9 @@ static struct isl_basic_set *uset_gist_set_eq(struct isl_basic_set *bset,
        bset = isl_basic_set_remove_equalities(bset, &T, &T2);
        if (!bset)
                goto error;
-       context = isl_basic_set_preimage(ctx, context, T);
+       context = isl_basic_set_preimage(context, T);
        bset = uset_gist(bset, context);
-       bset = isl_basic_set_preimage(ctx, bset, T2);
+       bset = isl_basic_set_preimage(bset, T2);
        bset = isl_basic_set_intersect(bset, affine_hull);
        return bset;
 error:

diff --git a/isl_mat.c b/isl_mat.c
index e89b5b3..1230a18 100644 (file)
--- a/isl_mat.c
+++ b/isl_mat.c
@@ -750,15 +750,17 @@ error:
  * the div array too as the number of rows in this array is assumed
  * to be equal to extra.
  */
-struct isl_basic_set *isl_basic_set_preimage(struct isl_ctx *ctx,
-       struct isl_basic_set *bset, struct isl_mat *mat)
+struct isl_basic_set *isl_basic_set_preimage(struct isl_basic_set *bset,
+       struct isl_mat *mat)
 {
+       struct isl_ctx *ctx;
        struct isl_mat *t;
        int i;
 
        if (!bset || !mat)
                goto error;
 
+       ctx = bset->ctx;
        bset = isl_basic_set_cow(bset);
        if (!bset)
                goto error;
@@ -808,9 +810,9 @@ error2:
        return NULL;
 }
 
-struct isl_set *isl_set_preimage(struct isl_ctx *ctx,
-       struct isl_set *set, struct isl_mat *mat)
+struct isl_set *isl_set_preimage(struct isl_set *set, struct isl_mat *mat)
 {
+       struct isl_ctx *ctx;
        int i;
 
        set = isl_set_cow(set);
@@ -819,7 +821,7 @@ struct isl_set *isl_set_preimage(struct isl_ctx *ctx,
 
        ctx = set->ctx;
        for (i = 0; i < set->n; ++i) {
-               set->p[i] = isl_basic_set_preimage(ctx, set->p[i],
+               set->p[i] = isl_basic_set_preimage(set->p[i],
                                                    isl_mat_copy(ctx, mat));
                if (!set->p[i])
                        goto error;

diff --git a/isl_mat.h b/isl_mat.h
index ea38739..f1ebc8c 100644 (file)
--- a/isl_mat.h
+++ b/isl_mat.h
@@ -71,10 +71,9 @@ void isl_mat_col_mul(struct isl_mat *mat, int dst_col, isl_int f, int src_col);
 void isl_mat_col_submul(struct isl_mat *mat,
                        int dst_col, isl_int f, int src_col);
 
-struct isl_basic_set *isl_basic_set_preimage(struct isl_ctx *ctx,
-       struct isl_basic_set *bset, struct isl_mat *mat);
-struct isl_set *isl_set_preimage(struct isl_ctx *ctx,
-       struct isl_set *set, struct isl_mat *mat);
+struct isl_basic_set *isl_basic_set_preimage(struct isl_basic_set *bset,
+       struct isl_mat *mat);
+struct isl_set *isl_set_preimage(struct isl_set *set, struct isl_mat *mat);
 
 void isl_mat_dump(struct isl_ctx *ctx, struct isl_mat *mat,
                                FILE *out, int indent);

diff --git a/isl_sample.c b/isl_sample.c
index f0bbd3f..bda8f68 100644 (file)
--- a/isl_sample.c
+++ b/isl_sample.c
@@ -124,7 +124,7 @@ static struct isl_basic_set *remove_lineality(struct isl_ctx *ctx,
                goto error;
        U = isl_mat_lin_to_aff(ctx, U);
        U = isl_mat_drop_cols(ctx, U, 1 + new_dim, old_dim - new_dim);
-       bset = isl_basic_set_preimage(ctx, bset, isl_mat_copy(ctx, U));
+       bset = isl_basic_set_preimage(bset, isl_mat_copy(ctx, U));
        if (!bset)
                goto error;
        *T = U;

diff --git a/isl_sample_piplib.c b/isl_sample_piplib.c
index a514ea7..478749e 100644 (file)
--- a/isl_sample_piplib.c
+++ b/isl_sample_piplib.c
@@ -119,7 +119,7 @@ static struct isl_basic_set *isl_basic_set_skew_to_positive_orthant(
        if (!bounds)
                goto error;
        U = isl_mat_drop_cols(ctx, U, 1 + new_dim, old_dim - new_dim);
-       bset = isl_basic_set_preimage(ctx, bset, isl_mat_copy(ctx, U));
+       bset = isl_basic_set_preimage(bset, isl_mat_copy(ctx, U));
        if (!bset)
                goto error;
        *T = U;