From 5a88ae9e5179829f004c2415f561f3b99af7bfdb Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Tue, 8 Nov 2011 19:57:33 +0100 Subject: [PATCH] update isl for introduction of isl_args Signed-off-by: Sven Verdoolaege --- barvinok/options.h | 5 +++-- barvinok_ehrhart_options.c | 12 ++++++------ barvinok_enumerate_e_options.c | 12 ++++++------ barvinok_enumerate_options.c | 11 +++++------ barvinok_enumerate_options.h | 3 ++- barvinok_summate.c | 11 +++++------ barvinok_union_options.c | 10 +++++----- barvinok_union_options.h | 2 +- basis_reduction.c | 2 +- bound.c | 11 +++++------ evalue_convert.h | 2 +- evalue_convert_options.c | 5 ++--- iscc.c | 13 ++++++------- isl | 2 +- lexmin.cc | 2 +- lexmin.h | 2 +- lexmin_options.c | 9 ++++----- options.c | 20 ++++++++++---------- pet | 2 +- polytope_lattice_width.c | 9 ++++----- polytope_scan.c | 9 ++++----- test.c | 2 +- test_approx.c | 9 ++++----- test_bound.c | 9 ++++----- verify.c | 8 ++++---- verify.h | 2 +- verify_lexsmaller.c | 9 ++++----- 27 files changed, 92 insertions(+), 101 deletions(-) diff --git a/barvinok/options.h b/barvinok/options.h index 90d9961..a48e0e1 100644 --- a/barvinok/options.h +++ b/barvinok/options.h @@ -112,8 +112,9 @@ struct barvinok_options { int gbr_only_first; }; -ISL_ARG_DECL(barvinok_options, struct barvinok_options, barvinok_options_arg) -ISL_ARG_CTX_DECL(barvinok_options, struct barvinok_options, barvinok_options_arg) +ISL_ARG_DECL(barvinok_options, struct barvinok_options, barvinok_options_args) +ISL_ARG_CTX_DECL(barvinok_options, struct barvinok_options, + barvinok_options_args) #if defined(__cplusplus) } diff --git a/barvinok_ehrhart_options.c b/barvinok_ehrhart_options.c index bf90e0d..28a189a 100644 --- a/barvinok_ehrhart_options.c +++ b/barvinok_ehrhart_options.c @@ -1,13 +1,13 @@ #include #include "barvinok_ehrhart_options.h" -struct isl_arg ehrhart_options_arg[] = { +ISL_ARGS_START(struct ehrhart_options, ehrhart_options_args) ISL_ARG_CHILD(struct ehrhart_options, convert, NULL, - convert_options_arg, "output conversion") -ISL_ARG_CHILD(struct ehrhart_options, barvinok, NULL, barvinok_options_arg, NULL) + &convert_options_args, "output conversion") +ISL_ARG_CHILD(struct ehrhart_options, barvinok, NULL, &barvinok_options_args, + NULL) ISL_ARG_BOOL(struct ehrhart_options, series, 's', "series", 0, "compute rational generating function") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(ehrhart_options, struct ehrhart_options, ehrhart_options_arg) +ISL_ARG_DEF(ehrhart_options, struct ehrhart_options, ehrhart_options_args) diff --git a/barvinok_enumerate_e_options.c b/barvinok_enumerate_e_options.c index a4ea197..7e54a56 100644 --- a/barvinok_enumerate_e_options.c +++ b/barvinok_enumerate_e_options.c @@ -1,11 +1,11 @@ #include "barvinok_enumerate_e_options.h" #include "config.h" -struct isl_arg enumerate_e_options_arg[] = { +ISL_ARGS_START(struct enumerate_e_options, enumerate_e_options_args) ISL_ARG_CHILD(struct enumerate_e_options, verify, NULL, - verify_options_arg, "verification") + &verify_options_args, "verification") ISL_ARG_CHILD(struct enumerate_e_options, convert, NULL, - convert_options_arg, "output conversion") + &convert_options_args, "output conversion") ISL_ARG_BOOL(struct enumerate_e_options, isl, 'i', "isl", 0, NULL) #ifdef HAVE_OMEGA ISL_ARG_BOOL(struct enumerate_e_options, omega, 'o', "omega", 0, NULL) @@ -18,7 +18,7 @@ ISL_ARG_BOOL(struct enumerate_e_options, series, 's', "series", 0, "compute rational generating function") ISL_ARG_BOOL(struct enumerate_e_options, function, 'e', "explicit", 0, "convert rgf to psp") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(enumerate_e_options, struct enumerate_e_options, enumerate_e_options_arg) +ISL_ARG_DEF(enumerate_e_options, struct enumerate_e_options, + enumerate_e_options_args) diff --git a/barvinok_enumerate_options.c b/barvinok_enumerate_options.c index 5de15bc..7e24a74 100644 --- a/barvinok_enumerate_options.c +++ b/barvinok_enumerate_options.c @@ -1,16 +1,15 @@ #include "barvinok_enumerate_options.h" -struct isl_arg enumerate_options_arg[] = { +ISL_ARGS_START(struct enumerate_options, enumerate_options_args) ISL_ARG_CHILD(struct enumerate_options, verify, NULL, - verify_options_arg, "verification") + &verify_options_args, "verification") ISL_ARG_CHILD(struct enumerate_options, convert, NULL, - convert_options_arg, "output conversion") + &convert_options_args, "output conversion") ISL_ARG_BOOL(struct enumerate_options, size, 'S', "size", 0, NULL) ISL_ARG_BOOL(struct enumerate_options, series, 's', "series", 0, "compute rational generating function") ISL_ARG_BOOL(struct enumerate_options, function, 'e', "explicit", 0, "convert rgf to psp") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(enumerate_options, struct enumerate_options, enumerate_options_arg) +ISL_ARG_DEF(enumerate_options, struct enumerate_options, enumerate_options_args) diff --git a/barvinok_enumerate_options.h b/barvinok_enumerate_options.h index 6dd7c79..bc9638d 100644 --- a/barvinok_enumerate_options.h +++ b/barvinok_enumerate_options.h @@ -14,7 +14,8 @@ struct enumerate_options { struct convert_options *convert; }; -ISL_ARG_DECL(enumerate_options, struct enumerate_options, enumerate_options_arg) +ISL_ARG_DECL(enumerate_options, struct enumerate_options, + enumerate_options_args) #if defined(__cplusplus) } diff --git a/barvinok_summate.c b/barvinok_summate.c index b8430f2..e00e331 100644 --- a/barvinok_summate.c +++ b/barvinok_summate.c @@ -9,13 +9,12 @@ struct options { struct verify_options *verify; }; -struct isl_arg options_arg[] = { +ISL_ARGS_START(struct options, options_args) ISL_ARG_CHILD(struct options, verify, NULL, - verify_options_arg, "verification") -ISL_ARG_END -}; + &verify_options_args, "verification") +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) struct verify_point_sum { struct verify_point_data vpd; @@ -160,7 +159,7 @@ int main(int argc, char **argv) struct options *options = options_new_with_defaults(); argc = options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(options_arg, options); + ctx = isl_ctx_alloc_with_options(&options_args, options); s = isl_stream_new_file(ctx, stdin); pwqp = isl_stream_read_pw_qpolynomial(s); diff --git a/barvinok_union_options.c b/barvinok_union_options.c index dbd1c27..832c0e1 100644 --- a/barvinok_union_options.c +++ b/barvinok_union_options.c @@ -1,11 +1,11 @@ #include #include "barvinok_union_options.h" -struct isl_arg union_options_arg[] = { -ISL_ARG_CHILD(struct union_options, barvinok, NULL, barvinok_options_arg, NULL) +ISL_ARGS_START(struct union_options, union_options_args) +ISL_ARG_CHILD(struct union_options, barvinok, NULL, &barvinok_options_args, + NULL) ISL_ARG_BOOL(struct union_options, series, 's', "series", 0, "compute rational generating function") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(union_options, struct union_options, union_options_arg) +ISL_ARG_DEF(union_options, struct union_options, union_options_args) diff --git a/barvinok_union_options.h b/barvinok_union_options.h index 5d9d79f..09cd55c 100644 --- a/barvinok_union_options.h +++ b/barvinok_union_options.h @@ -10,7 +10,7 @@ struct union_options { struct barvinok_options *barvinok; }; -ISL_ARG_DECL(union_options, struct union_options, union_options_arg) +ISL_ARG_DECL(union_options, struct union_options, union_options_args) #if defined(__cplusplus) } diff --git a/basis_reduction.c b/basis_reduction.c index 99f2a1a..07b5a6f 100644 --- a/basis_reduction.c +++ b/basis_reduction.c @@ -34,7 +34,7 @@ Matrix *isl_Polyhedron_Reduced_Basis(Polyhedron *P, int isl_gbr_only_first = options->isl->gbr_only_first; options->isl->gbr_only_first = options->gbr_only_first; - ctx = isl_ctx_alloc_with_options(barvinok_options_arg, options); + ctx = isl_ctx_alloc_with_options(&barvinok_options_args, options); assert(ctx); dim = isl_space_set_alloc(ctx, 0, nvar); diff --git a/bound.c b/bound.c index b2128de..aaafbc9 100644 --- a/bound.c +++ b/bound.c @@ -12,18 +12,17 @@ struct options { long iterate; }; -struct isl_arg options_arg[] = { +ISL_ARGS_START(struct options, options_args) ISL_ARG_CHILD(struct options, verify, NULL, - verify_options_arg, "verification") + &verify_options_args, "verification") ISL_ARG_LONG(struct options, split, 0, "split", 0, NULL) ISL_ARG_OPT_LONG(struct options, iterate, 0, "iterate", 0, -1, "exact result by iterating over domain (of specified maximal size)") ISL_ARG_BOOL(struct options, lower, 0, "lower", 0, "compute lower bound instead of upper bound") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) struct verify_point_bound { struct verify_point_data vpd; @@ -345,7 +344,7 @@ int main(int argc, char **argv) int result = 0; argc = options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(options_arg, options); + ctx = isl_ctx_alloc_with_options(&options_args, options); s = isl_stream_new_file(ctx, stdin); pwqp = isl_stream_read_pw_qpolynomial(s); diff --git a/evalue_convert.h b/evalue_convert.h index c54ad03..999f472 100644 --- a/evalue_convert.h +++ b/evalue_convert.h @@ -21,7 +21,7 @@ struct convert_options { int evalue_convert(evalue *EP, struct convert_options *options, int verbose, unsigned nparam, const char **params); -ISL_ARG_DECL(convert_options, struct convert_options, convert_options_arg) +ISL_ARG_DECL(convert_options, struct convert_options, convert_options_args) #if defined(__cplusplus) } diff --git a/evalue_convert_options.c b/evalue_convert_options.c index 4280d27..f0db5fd 100644 --- a/evalue_convert_options.c +++ b/evalue_convert_options.c @@ -1,6 +1,6 @@ #include "evalue_convert.h" -struct isl_arg convert_options_arg[] = { +ISL_ARGS_START(struct convert_options, convert_options_args) ISL_ARG_BOOL(struct convert_options, range, 'R', "range-reduction", 0, NULL) ISL_ARG_BOOL(struct convert_options, convert, 'c', "convert", 0, "convert fractionals to periodics") @@ -10,5 +10,4 @@ ISL_ARG_BOOL(struct convert_options, floor, 'f', "floor", 0, ISL_ARG_BOOL(struct convert_options, list, 'l', "list", 0, NULL) ISL_ARG_BOOL(struct convert_options, latex, 'L', "latex", 0, NULL) ISL_ARG_BOOL(struct convert_options, isl, 'I', "to-isl", 0, NULL) -ISL_ARG_END -}; +ISL_ARGS_END diff --git a/iscc.c b/iscc.c index 44a8384..2ae4b82 100644 --- a/iscc.c +++ b/iscc.c @@ -113,18 +113,17 @@ struct iscc_options { int io; }; -struct isl_arg iscc_options_arg[] = { -ISL_ARG_CHILD(struct iscc_options, barvinok, "barvinok", barvinok_options_arg, +ISL_ARGS_START(struct iscc_options, iscc_options_args) +ISL_ARG_CHILD(struct iscc_options, barvinok, "barvinok", &barvinok_options_args, "barvinok options") ISL_ARG_CHOICE(struct iscc_options, format, 0, "format", \ iscc_format, ISL_FORMAT_ISL, "output format") ISL_ARG_BOOL(struct iscc_options, io, 0, "io", 1, "allow read and write operations") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(iscc_options, struct iscc_options, iscc_options_arg) -ISL_ARG_CTX_DEF(iscc_options, struct iscc_options, iscc_options_arg) +ISL_ARG_DEF(iscc_options, struct iscc_options, iscc_options_args) +ISL_ARG_CTX_DEF(iscc_options, struct iscc_options, iscc_options_args) static void *isl_obj_bool_copy(void *v) { @@ -2549,7 +2548,7 @@ int main(int argc, char **argv) assert(options); argc = iscc_options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(iscc_options_arg, options); + ctx = isl_ctx_alloc_with_options(&iscc_options_args, options); s = isl_stream_new_file(ctx, stdin); assert(s); table = isl_hash_table_alloc(ctx, 10); diff --git a/isl b/isl index 5186370..c1e5c89 160000 --- a/isl +++ b/isl @@ -1 +1 @@ -Subproject commit 518637043dd40811cce0b0803cb303698e2a9062 +Subproject commit c1e5c89824b26b40ce10a78c1f61bd1b853ec0f0 diff --git a/lexmin.cc b/lexmin.cc index 50b99d0..aa7c451 100644 --- a/lexmin.cc +++ b/lexmin.cc @@ -2677,7 +2677,7 @@ int main(int argc, char **argv) options->verify->barvinok->lookup_table = 0; argc = lexmin_options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(lexmin_options_arg, options); + ctx = isl_ctx_alloc_with_options(&lexmin_options_args, options); context = isl_basic_set_read_from_file(ctx, stdin); assert(context); diff --git a/lexmin.h b/lexmin.h index e84aaeb..b9dd293 100644 --- a/lexmin.h +++ b/lexmin.h @@ -19,7 +19,7 @@ struct lexmin_options { struct verify_options *verify; }; -ISL_ARG_DECL(lexmin_options, struct lexmin_options, lexmin_options_arg) +ISL_ARG_DECL(lexmin_options, struct lexmin_options, lexmin_options_args) #if defined(__cplusplus) } diff --git a/lexmin_options.c b/lexmin_options.c index ea61c4c..539871a 100644 --- a/lexmin_options.c +++ b/lexmin_options.c @@ -7,13 +7,12 @@ static struct isl_arg_choice check[] = { {0} }; -struct isl_arg lexmin_options_arg[] = { +ISL_ARGS_START(struct lexmin_options, lexmin_options_args) ISL_ARG_CHILD(struct lexmin_options, verify, NULL, - verify_options_arg, "verification") + &verify_options_args, "verification") ISL_ARG_BOOL(struct lexmin_options, reduce, 0, "reduction", 1, NULL) ISL_ARG_CHOICE(struct lexmin_options, emptiness_check, 0, "emptiness-check", check, BV_LEXMIN_EMPTINESS_CHECK_SAMPLE, NULL) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(lexmin_options, struct lexmin_options, lexmin_options_arg) +ISL_ARG_DEF(lexmin_options, struct lexmin_options, lexmin_options_args) diff --git a/options.c b/options.c index 9e80834..1f6c33f 100644 --- a/options.c +++ b/options.c @@ -81,7 +81,7 @@ static int set_method(void *opt, unsigned val) return 0; } -static struct isl_arg approx_options_arg[] = { +ISL_ARGS_START(struct barvinok_approximation_options, approx_options_args) ISL_ARG_USER_OPT_CHOICE(struct barvinok_approximation_options, approximation, 0, "polynomial-approximation", approx, &set_approx, BV_APPROX_SIGN_NONE, BV_APPROX_SIGN_APPROX, NULL) @@ -94,8 +94,7 @@ ISL_ARG_FLAGS(struct barvinok_approximation_options, scale_flags, 0, ISL_ARG_CHOICE(struct barvinok_approximation_options, volume_triangulate, 0, "volume-triangulation", triangulation, BV_VOL_VERTEX, "type of triangulation to perform in volume computation") -ISL_ARG_END -}; +ISL_ARGS_END static int stats_init(void *user) { @@ -197,10 +196,11 @@ static struct isl_arg_choice hull[] = { {0} }; -struct isl_arg barvinok_options_arg[] = { -ISL_ARG_CHILD(struct barvinok_options, isl, "isl", isl_options_arg, "isl options") +ISL_ARGS_START(struct barvinok_options, barvinok_options_args) +ISL_ARG_CHILD(struct barvinok_options, isl, "isl", &isl_options_args, + "isl options") ISL_ARG_CHILD(struct barvinok_options, approx, NULL, - approx_options_arg, "polynomial approximation") + &approx_options_args, "polynomial approximation") ISL_ARG_USER(struct barvinok_options, stats, &stats_init, &stats_clear) ISL_ARG_USER(struct barvinok_options, MaxRays, &maxrays_init, NULL) ISL_ARG_LONG(struct barvinok_options, LLL_a, 0, "lll-reduction-num", 1, @@ -229,8 +229,8 @@ ISL_ARG_USER(struct barvinok_options, gbr_only_first, &int_init_zero, NULL) ISL_ARG_BOOL(struct barvinok_options, print_stats, 0, "print-stats", 0, NULL) ISL_ARG_BOOL(struct barvinok_options, verbose, 0, "verbose", 0, NULL) ISL_ARG_VERSION(print_version) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(barvinok_options, struct barvinok_options, barvinok_options_arg) -ISL_ARG_CTX_DEF(barvinok_options, struct barvinok_options, barvinok_options_arg) +ISL_ARG_DEF(barvinok_options, struct barvinok_options, barvinok_options_args) +ISL_ARG_CTX_DEF(barvinok_options, struct barvinok_options, + barvinok_options_args) diff --git a/pet b/pet index 044484d..e7bb5ad 160000 --- a/pet +++ b/pet @@ -1 +1 @@ -Subproject commit 044484d389819cbaefd8b12b12ff71227206e4e6 +Subproject commit e7bb5ada84cf5c301b99b24c56e6ee119d717e57 diff --git a/polytope_lattice_width.c b/polytope_lattice_width.c index ae4663c..d1e2b67 100644 --- a/polytope_lattice_width.c +++ b/polytope_lattice_width.c @@ -9,14 +9,13 @@ struct arguments { int direction; }; -struct isl_arg options_arg[] = { -ISL_ARG_CHILD(struct arguments, barvinok, NULL, barvinok_options_arg, NULL) +ISL_ARGS_START(struct arguments, options_args) +ISL_ARG_CHILD(struct arguments, barvinok, NULL, &barvinok_options_args, NULL) ISL_ARG_BOOL(struct arguments, direction, 'd', "direction", 0, "print width directions") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct arguments, options_arg) +ISL_ARG_DEF(options, struct arguments, options_args) int main(int argc, char **argv) { diff --git a/polytope_scan.c b/polytope_scan.c index e33eba0..f14139b 100644 --- a/polytope_scan.c +++ b/polytope_scan.c @@ -13,14 +13,13 @@ struct options { int direct; }; -struct isl_arg options_arg[] = { -ISL_ARG_CHILD(struct options, barvinok, NULL, barvinok_options_arg, NULL) +ISL_ARGS_START(struct options, options_args) +ISL_ARG_CHILD(struct options, barvinok, NULL, &barvinok_options_args, NULL) ISL_ARG_BOOL(struct options, direct, 'd', "direct", 0, "don't apply generalized basis reduction first") -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) static void scan_poly(Polyhedron *S, int pos, Value *z, Matrix *T) { diff --git a/test.c b/test.c index 82ac27c..62d1083 100644 --- a/test.c +++ b/test.c @@ -43,7 +43,7 @@ int main(int argc, char **argv) struct barvinok_options *options = barvinok_options_new_with_defaults(); argc = barvinok_options_parse(options, argc, argv, ISL_ARG_ALL); - ctx = isl_ctx_alloc_with_options(barvinok_options_arg, options); + ctx = isl_ctx_alloc_with_options(&barvinok_options_args, options); nbPol = nbVec = nbMat = 0; fgets(s, 128, stdin); diff --git a/test_approx.c b/test_approx.c index 8e8ae5f..a995bb5 100644 --- a/test_approx.c +++ b/test_approx.c @@ -87,13 +87,12 @@ struct options { struct verify_options *verify; }; -struct isl_arg options_arg[] = { -ISL_ARG_CHILD(struct options, verify, NULL, verify_options_arg, NULL) +ISL_ARGS_START(struct options, options_args) +ISL_ARG_CHILD(struct options, verify, NULL, &verify_options_args, NULL) ISL_ARG_BOOL(struct options, quiet, 'q', "quiet", 0, NULL) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) struct result_data { Value n; diff --git a/test_bound.c b/test_bound.c index 66d94d9..dffec57 100644 --- a/test_bound.c +++ b/test_bound.c @@ -47,13 +47,12 @@ struct options { int quiet; }; -struct isl_arg options_arg[] = { -ISL_ARG_CHILD(struct options, verify, NULL, verify_options_arg, NULL) +ISL_ARGS_START(struct options, options_args) +ISL_ARG_CHILD(struct options, verify, NULL, &verify_options_args, NULL) ISL_ARG_BOOL(struct options, quiet, 'q', "quiet", 0, NULL) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(options, struct options, options_arg) +ISL_ARG_DEF(options, struct options, options_args) struct result_data { isl_int n; diff --git a/verify.c b/verify.c index 285fe3a..44aa296 100644 --- a/verify.c +++ b/verify.c @@ -47,8 +47,9 @@ static int set_r(void *opt, long val) return 0; } -struct isl_arg verify_options_arg[] = { -ISL_ARG_CHILD(struct verify_options, barvinok, NULL, barvinok_options_arg, NULL) +ISL_ARGS_START(struct verify_options, verify_options_args) +ISL_ARG_CHILD(struct verify_options, barvinok, NULL, &barvinok_options_args, + NULL) ISL_ARG_BOOL(struct verify_options, verify, 'T', "verify", 0, NULL) ISL_ARG_BOOL(struct verify_options, exact, 'E', "exact", 0, NULL) ISL_ARG_BOOL(struct verify_options, print_all, 'A', "print-all", 0, NULL) @@ -57,8 +58,7 @@ ISL_ARG_BOOL(struct verify_options, continue_on_error, 'C', ISL_ARG_USER_LONG(struct verify_options, m, 'm', "min", set_m, INT_MAX, NULL) ISL_ARG_USER_LONG(struct verify_options, M, 'M', "max", set_M, INT_MIN, NULL) ISL_ARG_USER_LONG(struct verify_options, r, 'r', "range", set_r, -1, NULL) -ISL_ARG_END -}; +ISL_ARGS_END void verify_options_set_range(struct verify_options *options, int dim) { diff --git a/verify.h b/verify.h index 9d785f3..cc6d038 100644 --- a/verify.h +++ b/verify.h @@ -24,7 +24,7 @@ struct verify_options { struct barvinok_options *barvinok; }; -ISL_ARG_DECL(verify_options, struct verify_options, verify_options_arg) +ISL_ARG_DECL(verify_options, struct verify_options, verify_options_args) void verify_options_set_range(struct verify_options *options, int dim); diff --git a/verify_lexsmaller.c b/verify_lexsmaller.c index d2882b8..65c5742 100644 --- a/verify_lexsmaller.c +++ b/verify_lexsmaller.c @@ -10,15 +10,14 @@ struct arguments { struct barvinok_options *barvinok; }; -struct isl_arg arguments_arg[] = { -ISL_ARG_CHILD(struct arguments, barvinok, NULL, barvinok_options_arg, NULL) +ISL_ARGS_START(struct arguments, arguments_args) +ISL_ARG_CHILD(struct arguments, barvinok, NULL, &barvinok_options_args, NULL) ISL_ARG_BOOL(struct arguments, live, 'l', "live", 0, NULL) ISL_ARG_BOOL(struct arguments, print_max, 'M', "max", 0, NULL) ISL_ARG_BOOL(struct arguments, keep_going, 'k', "continue", 0, NULL) -ISL_ARG_END -}; +ISL_ARGS_END -ISL_ARG_DEF(arguments, struct arguments, arguments_arg) +ISL_ARG_DEF(arguments, struct arguments, arguments_args) #define LS_OK 1 #define LS_P 2 /* continue searching P */ -- 2.11.4.GIT