drop redundant input_format argument from reading functions

diff --git a/doc/user.pod b/doc/user.pod
index 8a887ab..d780e1f 100644 (file)
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -377,31 +377,21 @@ to foreign file formats.
 
        #include <isl_set.h>
        __isl_give isl_basic_set *isl_basic_set_read_from_file(
-               isl_ctx *ctx, FILE *input, unsigned nparam,
-               unsigned input_format);
+               isl_ctx *ctx, FILE *input, unsigned nparam);
        __isl_give isl_basic_set *isl_basic_set_read_from_str(
-               isl_ctx *ctx, const char *str, unsigned nparam,
-               unsigned input_format);
+               isl_ctx *ctx, const char *str, unsigned nparam);
        __isl_give isl_set *isl_set_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam,
-               unsigned input_format);
+               FILE *input, unsigned nparam);
 
        #include <isl_map.h>
        __isl_give isl_basic_map *isl_basic_map_read_from_file(
-               isl_ctx *ctx, FILE *input, unsigned nparam,
-               unsigned input_format);
-
-C<input_format> may be either C<ISL_FORMAT_POLYLIB> or
-C<ISL_FORMAT_OMEGA>.  However, not all combination are currently
-supported.  Furthermore, only a very limited subset of
-the C<Omega> input format is currently supported.
-In particular, C<isl_basic_set_read_from_str> and
-C<isl_basic_map_read_from_file> only
-support C<ISL_FORMAT_OMEGA>, while C<isl_set_read_from_file>
-only supports C<ISL_FORMAT_POLYLIB>.
+               isl_ctx *ctx, FILE *input, unsigned nparam);
+
+The input may be either in C<PolyLib> format or in an
+C<Omega>-like format.
 C<nparam> specifies how many of the final columns in
 the C<PolyLib> format correspond to parameters.  It should
-be zero when C<ISL_FORMAT_OMEGA> is used.
+be zero when C<Omega>-like input is expected.
 
 =head3 Output
 

diff --git a/include/isl_map.h b/include/isl_map.h
index dd1f267..9d9e785 100644 (file)
--- a/include/isl_map.h
+++ b/include/isl_map.h
@@ -181,10 +181,8 @@ __isl_give isl_basic_map *isl_basic_map_sample(__isl_take isl_basic_map *bmap);
 struct isl_basic_map *isl_basic_map_simplify(struct isl_basic_map *bmap);
 struct isl_basic_map *isl_basic_map_detect_equalities(
                                                struct isl_basic_map *bmap);
-#define ISL_FORMAT_POLYLIB     1
-#define ISL_FORMAT_OMEGA       2
 __isl_give isl_basic_map *isl_basic_map_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format);
+               FILE *input, unsigned nparam);
 struct isl_basic_map *isl_basic_map_fix_si(struct isl_basic_map *bmap,
                enum isl_dim_type type, unsigned pos, int value);
 

diff --git a/include/isl_set.h b/include/isl_set.h
index fc346b4..99dde24 100644 (file)
--- a/include/isl_set.h
+++ b/include/isl_set.h
@@ -127,15 +127,14 @@ __isl_give isl_basic_set *isl_basic_set_detect_equalities(
                                                __isl_take isl_basic_set *bset);
 struct isl_basic_set *isl_basic_set_product(struct isl_basic_set_list *list);
 
-#define ISL_FORMAT_POLYLIB             1
-#define ISL_FORMAT_OMEGA               2
 __isl_give isl_basic_set *isl_basic_set_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format);
+               FILE *input, unsigned nparam);
 __isl_give isl_basic_set *isl_basic_set_read_from_str(isl_ctx *ctx,
-               const char *str, unsigned nparam, unsigned input_format);
+               const char *str, unsigned nparam);
 __isl_give isl_set *isl_set_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format);
-#define ISL_FORMAT_POLYLIB_CONSTRAINTS 3
+               FILE *input, unsigned nparam);
+#define ISL_FORMAT_POLYLIB             1
+#define ISL_FORMAT_POLYLIB_CONSTRAINTS 2
 void isl_basic_set_print(__isl_keep isl_basic_set *bset, FILE *out, int indent,
        const char *prefix, const char *suffix, unsigned output_format);
 void isl_set_print(__isl_keep struct isl_set *set, FILE *out, int indent,

diff --git a/isl_input.c b/isl_input.c
index 50a1f7c..770f0d4 100644 (file)
--- a/isl_input.c
+++ b/isl_input.c
@@ -607,7 +607,7 @@ error:
 }
 
 __isl_give isl_basic_map *isl_basic_map_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format)
+               FILE *input, unsigned nparam)
 {
        struct isl_basic_map *bmap;
        struct isl_stream *s = isl_stream_new_file(ctx, input);
@@ -619,10 +619,10 @@ __isl_give isl_basic_map *isl_basic_map_read_from_file(isl_ctx *ctx,
 }
 
 __isl_give isl_basic_set *isl_basic_set_read_from_file(isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format)
+               FILE *input, unsigned nparam)
 {
        struct isl_basic_map *bmap;
-       bmap = isl_basic_map_read_from_file(ctx, input, nparam, input_format);
+       bmap = isl_basic_map_read_from_file(ctx, input, nparam);
        if (!bmap)
                return NULL;
        isl_assert(ctx, isl_basic_map_n_in(bmap) == 0, goto error);
@@ -633,7 +633,7 @@ error:
 }
 
 struct isl_basic_map *isl_basic_map_read_from_str(struct isl_ctx *ctx,
-               const char *str, unsigned nparam, unsigned input_format)
+               const char *str, unsigned nparam)
 {
        struct isl_basic_map *bmap;
        struct isl_stream *s = isl_stream_new_str(ctx, str);
@@ -645,10 +645,10 @@ struct isl_basic_map *isl_basic_map_read_from_str(struct isl_ctx *ctx,
 }
 
 struct isl_basic_set *isl_basic_set_read_from_str(struct isl_ctx *ctx,
-               const char *str, unsigned nparam, unsigned input_format)
+               const char *str, unsigned nparam)
 {
        struct isl_basic_map *bmap;
-       bmap = isl_basic_map_read_from_str(ctx, str, nparam, input_format);
+       bmap = isl_basic_map_read_from_str(ctx, str, nparam);
        if (!bmap)
                return NULL;
        isl_assert(ctx, isl_basic_map_n_in(bmap) == 0, goto error);
@@ -659,7 +659,7 @@ error:
 }
 
 __isl_give isl_map *isl_map_read_from_file(struct isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format)
+               FILE *input, unsigned nparam)
 {
        struct isl_map *map;
        struct isl_stream *s = isl_stream_new_file(ctx, input);
@@ -671,10 +671,10 @@ __isl_give isl_map *isl_map_read_from_file(struct isl_ctx *ctx,
 }
 
 __isl_give isl_set *isl_set_read_from_file(struct isl_ctx *ctx,
-               FILE *input, unsigned nparam, unsigned input_format)
+               FILE *input, unsigned nparam)
 {
        struct isl_map *map;
-       map = isl_map_read_from_file(ctx, input, nparam, input_format);
+       map = isl_map_read_from_file(ctx, input, nparam);
        if (!map)
                return NULL;
        isl_assert(ctx, isl_map_n_in(map) == 0, goto error);

diff --git a/isl_test.c b/isl_test.c
index aabfcc0..2823e2d 100644 (file)
--- a/isl_test.c
+++ b/isl_test.c
@@ -30,8 +30,8 @@ void test_read(struct isl_ctx *ctx)
        input = fopen(filename, "r");
        assert(input);
 
-       bset1 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_OMEGA);
-       bset2 = isl_basic_set_read_from_str(ctx, str, 0, ISL_FORMAT_OMEGA);
+       bset1 = isl_basic_set_read_from_file(ctx, input, 0);
+       bset2 = isl_basic_set_read_from_str(ctx, str, 0);
 
        assert(isl_basic_set_is_equal(bset1, bset2) == 1);
 
@@ -370,12 +370,12 @@ void test_application_case(struct isl_ctx *ctx, const char *name)
        input = fopen(filename, "r");
        assert(input);
 
-       bset1 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_OMEGA);
-       bmap = isl_basic_map_read_from_file(ctx, input, 0, ISL_FORMAT_OMEGA);
+       bset1 = isl_basic_set_read_from_file(ctx, input, 0);
+       bmap = isl_basic_map_read_from_file(ctx, input, 0);
 
        bset1 = isl_basic_set_apply(bset1, bmap);
 
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_OMEGA);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        assert(isl_basic_set_is_equal(bset1, bset2) == 1);
 
@@ -404,8 +404,8 @@ void test_affine_hull_case(struct isl_ctx *ctx, const char *name)
        input = fopen(filename, "r");
        assert(input);
 
-       bset1 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
+       bset1 = isl_basic_set_read_from_file(ctx, input, 0);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        bset1 = isl_basic_set_affine_hull(bset1);
 
@@ -438,13 +438,13 @@ void test_convex_hull_case(struct isl_ctx *ctx, const char *name)
        input = fopen(filename, "r");
        assert(input);
 
-       bset1 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
+       bset1 = isl_basic_set_read_from_file(ctx, input, 0);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        set = isl_basic_set_union(bset1, bset2);
        bset1 = isl_set_convex_hull(set);
 
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        assert(isl_basic_set_is_equal(bset1, bset2) == 1);
 
@@ -486,12 +486,12 @@ void test_gist_case(struct isl_ctx *ctx, const char *name)
        input = fopen(filename, "r");
        assert(input);
 
-       bset1 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
+       bset1 = isl_basic_set_read_from_file(ctx, input, 0);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        bset1 = isl_basic_set_gist(bset1, bset2);
 
-       bset2 = isl_basic_set_read_from_file(ctx, input, 0, ISL_FORMAT_POLYLIB);
+       bset2 = isl_basic_set_read_from_file(ctx, input, 0);
 
        assert(isl_basic_set_is_equal(bset1, bset2) == 1);
 
@@ -513,8 +513,8 @@ static struct isl_set *s_union(struct isl_ctx *ctx,
        struct isl_basic_set *bset2;
        struct isl_set *set1, *set2;
 
-       bset1 = isl_basic_set_read_from_str(ctx, s1, 0, ISL_FORMAT_OMEGA);
-       bset2 = isl_basic_set_read_from_str(ctx, s2, 0, ISL_FORMAT_OMEGA);
+       bset1 = isl_basic_set_read_from_str(ctx, s1, 0);
+       bset2 = isl_basic_set_read_from_str(ctx, s2, 0);
        set1 = isl_set_from_basic_set(bset1);
        set2 = isl_set_from_basic_set(bset2);
        return isl_set_union(set1, set2);

diff --git a/pip.c b/pip.c
index ae92a81..6c0ffe1 100644 (file)
--- a/pip.c
+++ b/pip.c
@@ -318,13 +318,13 @@ int main(int argc, char **argv)
        ctx = isl_ctx_alloc_with_options(options->isl);
        options->isl = NULL;
 
-       context = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
+       context = isl_basic_set_read_from_file(ctx, stdin, 0);
        assert(context);
        n = fscanf(stdin, "%d", &neg_one);
        assert(n == 1);
        assert(neg_one == -1);
        bset = isl_basic_set_read_from_file(ctx, stdin,
-               isl_basic_set_dim(context, isl_dim_set), ISL_FORMAT_POLYLIB);
+               isl_basic_set_dim(context, isl_dim_set));
 
        while (fgets(s, sizeof(s), stdin)) {
                if (strncasecmp(s, "Maximize", 8) == 0)

diff --git a/polyhedron_detect_equalities.c b/polyhedron_detect_equalities.c
index 7770862..7b069f9 100644 (file)
--- a/polyhedron_detect_equalities.c
+++ b/polyhedron_detect_equalities.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv)
        struct isl_ctx *ctx = isl_ctx_alloc();
        struct isl_basic_set *bset;
 
-       bset = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
+       bset = isl_basic_set_read_from_file(ctx, stdin, 0);
        bset = isl_basic_set_detect_equalities(bset);
        isl_basic_set_print(bset, stdout, 0, "", "", ISL_FORMAT_POLYLIB);
        isl_basic_set_free(bset);

diff --git a/polyhedron_minimize.c b/polyhedron_minimize.c
index 16ab138..53a35d5 100644 (file)
--- a/polyhedron_minimize.c
+++ b/polyhedron_minimize.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
        enum isl_lp_result res;
 
        isl_int_init(opt);
-       bset = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
+       bset = isl_basic_set_read_from_file(ctx, stdin, 0);
        assert(bset);
        obj = isl_vec_read_from_file(ctx, stdin, ISL_FORMAT_POLYLIB);
        assert(obj);

diff --git a/polyhedron_sample.c b/polyhedron_sample.c
index d4b00ac..6b07c7f 100644 (file)
--- a/polyhedron_sample.c
+++ b/polyhedron_sample.c
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
        struct isl_basic_set *bset;
        struct isl_vec *sample;
 
-       bset = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
+       bset = isl_basic_set_read_from_file(ctx, stdin, 0);
        sample = isl_basic_set_sample_vec(isl_basic_set_copy(bset));
        isl_vec_dump(sample, stdout, 0);
        assert(sample);

diff --git a/polytope_scan.c b/polytope_scan.c
index d6b477e..41983aa 100644 (file)
--- a/polytope_scan.c
+++ b/polytope_scan.c
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
        struct isl_basic_set *bset;
        struct isl_mat *samples;
 
-       bset = isl_basic_set_read_from_file(ctx, stdin, 0, ISL_FORMAT_POLYLIB);
+       bset = isl_basic_set_read_from_file(ctx, stdin, 0);
        samples = isl_basic_set_samples(bset);
        isl_mat_dump(samples, stdout, 0);
        isl_mat_free(samples);