From c1351d995d053c0efec2c6400d0f77428113928a Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Wed, 20 Sep 2017 14:40:03 +0200 Subject: [PATCH] drop deprecated isl_int interface The isl_int interface was deprecated in isl-0.12-11-g6272dbd9df (deprecate isl_int, Fri May 3 18:31:59 2013 +0200). Most of the formerly exposed functions are still used internally. The functions that are not used in the current code base and that are unlikely to be used in the near future are removed together with the declarations. Signed-off-by: Sven Verdoolaege --- Makefile.am | 19 ----- include/isl/deprecated/aff_int.h | 45 ----------- include/isl/deprecated/ast_int.h | 17 ---- include/isl/deprecated/constraint_int.h | 25 ------ include/isl/deprecated/ilp_int.h | 23 ------ include/isl/deprecated/int.h | 136 -------------------------------- include/isl/deprecated/map_int.h | 25 ------ include/isl/deprecated/mat_int.h | 19 ----- include/isl/deprecated/point_int.h | 20 ----- include/isl/deprecated/polynomial_int.h | 32 -------- include/isl/deprecated/set_int.h | 27 ------- include/isl/deprecated/union_map_int.h | 18 ----- include/isl/deprecated/val_int.h | 18 ----- include/isl/deprecated/vec_int.h | 22 ------ isl_aff.c | 87 -------------------- isl_aff_private.h | 1 - isl_ast_int.c | 13 --- isl_constraint.c | 1 - isl_constraint_private.h | 5 -- isl_fold.c | 1 - isl_hide_deprecated.h | 52 ------------ isl_ilp.c | 19 ----- isl_int_imath.h | 2 - isl_map.c | 8 -- isl_map_private.h | 2 - isl_mat.c | 1 - isl_point.c | 42 ---------- isl_polynomial.c | 8 -- isl_union_map.c | 1 - isl_union_templ.c | 32 -------- isl_vec.c | 13 --- 31 files changed, 734 deletions(-) delete mode 100644 include/isl/deprecated/aff_int.h delete mode 100644 include/isl/deprecated/ast_int.h delete mode 100644 include/isl/deprecated/constraint_int.h delete mode 100644 include/isl/deprecated/ilp_int.h delete mode 100644 include/isl/deprecated/int.h delete mode 100644 include/isl/deprecated/map_int.h delete mode 100644 include/isl/deprecated/mat_int.h delete mode 100644 include/isl/deprecated/point_int.h delete mode 100644 include/isl/deprecated/polynomial_int.h delete mode 100644 include/isl/deprecated/set_int.h delete mode 100644 include/isl/deprecated/union_map_int.h delete mode 100644 include/isl/deprecated/val_int.h delete mode 100644 include/isl/deprecated/vec_int.h delete mode 100644 isl_ast_int.c delete mode 100644 isl_hide_deprecated.h diff --git a/Makefile.am b/Makefile.am index aef0abfe..53d88d4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ TESTS = isl_test codegen_test.sh pip_test.sh bound_test.sh isl_test_int \ if IMATH_FOR_MP MP_SRC = \ - isl_hide_deprecated.h \ isl_imath.c \ isl_imath.h \ isl_int_imath.h \ @@ -42,7 +41,6 @@ else MP_SRC += isl_val_imath.c endif -DEPRECATED_SRC = MP_INCLUDE_H = endif @@ -57,7 +55,6 @@ MP_SRC = \ isl_gmp.c \ isl_val_gmp.c -DEPRECATED_SRC = isl_ast_int.c MP_INCLUDE_H = include/isl/val_gmp.h endif @@ -66,7 +63,6 @@ AM_CFLAGS = @WARNING_FLAGS@ libisl_la_SOURCES = \ $(MP_SRC) \ - $(DEPRECATED_SRC) \ isl_aff.c \ isl_aff_private.h \ isl_affine_hull.c \ @@ -322,21 +318,6 @@ pkginclude_HEADERS = \ include/isl/vec.h \ include/isl/version.h \ include/isl/vertices.h -deprecateddir = $(pkgincludedir)/deprecated -deprecated_HEADERS = \ - include/isl/deprecated/int.h \ - include/isl/deprecated/aff_int.h \ - include/isl/deprecated/ast_int.h \ - include/isl/deprecated/constraint_int.h \ - include/isl/deprecated/ilp_int.h \ - include/isl/deprecated/map_int.h \ - include/isl/deprecated/mat_int.h \ - include/isl/deprecated/point_int.h \ - include/isl/deprecated/polynomial_int.h \ - include/isl/deprecated/set_int.h \ - include/isl/deprecated/union_map_int.h \ - include/isl/deprecated/val_int.h \ - include/isl/deprecated/vec_int.h BUILT_SOURCES = gitversion.h diff --git a/include/isl/deprecated/aff_int.h b/include/isl/deprecated/aff_int.h deleted file mode 100644 index a0673747..00000000 --- a/include/isl/deprecated/aff_int.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef ISL_DEPRECATED_AFF_INT_H -#define ISL_DEPRECATED_AFF_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -int isl_aff_get_constant(__isl_keep isl_aff *aff, isl_int *v); -int isl_aff_get_coefficient(__isl_keep isl_aff *aff, - enum isl_dim_type type, int pos, isl_int *v); -isl_stat isl_aff_get_denominator(__isl_keep isl_aff *aff, isl_int *v); -__isl_give isl_aff *isl_aff_set_constant(__isl_take isl_aff *aff, isl_int v); -__isl_give isl_aff *isl_aff_set_coefficient(__isl_take isl_aff *aff, - enum isl_dim_type type, int pos, isl_int v); -__isl_give isl_aff *isl_aff_set_denominator(__isl_take isl_aff *aff, isl_int v); -__isl_give isl_aff *isl_aff_add_constant(__isl_take isl_aff *aff, isl_int v); -__isl_give isl_aff *isl_aff_add_constant_num(__isl_take isl_aff *aff, - isl_int v); -__isl_give isl_aff *isl_aff_add_coefficient(__isl_take isl_aff *aff, - enum isl_dim_type type, int pos, isl_int v); - -__isl_give isl_aff *isl_aff_mod(__isl_take isl_aff *aff, isl_int mod); - -__isl_give isl_aff *isl_aff_scale(__isl_take isl_aff *aff, isl_int f); -__isl_give isl_aff *isl_aff_scale_down(__isl_take isl_aff *aff, isl_int f); - -__isl_give isl_pw_aff *isl_pw_aff_mod(__isl_take isl_pw_aff *pwaff, - isl_int mod); - -__isl_give isl_pw_aff *isl_pw_aff_scale(__isl_take isl_pw_aff *pwaff, - isl_int f); -__isl_give isl_pw_aff *isl_pw_aff_scale_down(__isl_take isl_pw_aff *pwaff, - isl_int f); - -__isl_give isl_multi_aff *isl_multi_aff_scale(__isl_take isl_multi_aff *maff, - isl_int f); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/ast_int.h b/include/isl/deprecated/ast_int.h deleted file mode 100644 index 7d2039be..00000000 --- a/include/isl/deprecated/ast_int.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef ISL_DEPRECATED_AST_INT_H -#define ISL_DEPRECATED_AST_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -int isl_ast_expr_get_int(__isl_keep isl_ast_expr *expr, isl_int *v); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/constraint_int.h b/include/isl/deprecated/constraint_int.h deleted file mode 100644 index c5ab0aab..00000000 --- a/include/isl/deprecated/constraint_int.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef ISL_DEPRECATED_CONSTRAINT_INT_H -#define ISL_DEPRECATED_CONSTRAINT_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -void isl_constraint_get_constant(__isl_keep isl_constraint *constraint, - isl_int *v); -void isl_constraint_get_coefficient(__isl_keep isl_constraint *constraint, - enum isl_dim_type type, int pos, isl_int *v); -__isl_give isl_constraint *isl_constraint_set_constant( - __isl_take isl_constraint *constraint, isl_int v); -__isl_give isl_constraint *isl_constraint_set_coefficient( - __isl_take isl_constraint *constraint, - enum isl_dim_type type, int pos, isl_int v); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/ilp_int.h b/include/isl/deprecated/ilp_int.h deleted file mode 100644 index b952e1b1..00000000 --- a/include/isl/deprecated/ilp_int.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef ISL_DEPRECATED_ILP_INT_H -#define ISL_DEPRECATED_ILP_INT_H - -#include -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -enum isl_lp_result isl_basic_set_max(__isl_keep isl_basic_set *bset, - __isl_keep isl_aff *obj, isl_int *opt); -enum isl_lp_result isl_set_min(__isl_keep isl_set *set, - __isl_keep isl_aff *obj, isl_int *opt); -enum isl_lp_result isl_set_max(__isl_keep isl_set *set, - __isl_keep isl_aff *obj, isl_int *opt); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/int.h b/include/isl/deprecated/int.h deleted file mode 100644 index 98782346..00000000 --- a/include/isl/deprecated/int.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 2008-2009 Katholieke Universiteit Leuven - * - * Use of this software is governed by the MIT license - * - * Written by Sven Verdoolaege, K.U.Leuven, Departement - * Computerwetenschappen, Celestijnenlaan 200A, B-3001 Leuven, Belgium - */ - -#ifndef ISL_DEPRECATED_INT_H -#define ISL_DEPRECATED_INT_H - -#include -#include -#include -#if defined(__cplusplus) -#include -#endif - -#if defined(__cplusplus) -extern "C" { -#endif - -#ifndef mp_get_memory_functions -void mp_get_memory_functions( - void *(**alloc_func_ptr) (size_t), - void *(**realloc_func_ptr) (void *, size_t, size_t), - void (**free_func_ptr) (void *, size_t)); -#endif - -/* isl_int is the basic integer type. It currently always corresponds - * to a gmp mpz_t, but in the future, different types such as long long - * or cln::cl_I will be supported. - */ -typedef mpz_t isl_int; - -#define isl_int_init(i) mpz_init(i) -#define isl_int_clear(i) mpz_clear(i) - -#define isl_int_set(r,i) mpz_set(r,i) -#define isl_int_set_gmp(r,i) mpz_set(r,i) -#define isl_int_set_si(r,i) mpz_set_si(r,i) -#define isl_int_set_ui(r,i) mpz_set_ui(r,i) -#define isl_int_get_gmp(i,g) mpz_set(g,i) -#define isl_int_get_si(r) mpz_get_si(r) -#define isl_int_get_ui(r) mpz_get_ui(r) -#define isl_int_get_d(r) mpz_get_d(r) -#define isl_int_get_str(r) mpz_get_str(0, 10, r) -typedef void (*isl_int_print_gmp_free_t)(void *, size_t); -#define isl_int_free_str(s) \ - do { \ - isl_int_print_gmp_free_t gmp_free; \ - mp_get_memory_functions(NULL, NULL, &gmp_free); \ - (*gmp_free)(s, strlen(s) + 1); \ - } while (0) -#define isl_int_abs(r,i) mpz_abs(r,i) -#define isl_int_neg(r,i) mpz_neg(r,i) -#define isl_int_swap(i,j) mpz_swap(i,j) -#define isl_int_swap_or_set(i,j) mpz_swap(i,j) -#define isl_int_add_ui(r,i,j) mpz_add_ui(r,i,j) -#define isl_int_sub_ui(r,i,j) mpz_sub_ui(r,i,j) - -#define isl_int_add(r,i,j) mpz_add(r,i,j) -#define isl_int_sub(r,i,j) mpz_sub(r,i,j) -#define isl_int_mul(r,i,j) mpz_mul(r,i,j) -#define isl_int_mul_2exp(r,i,j) mpz_mul_2exp(r,i,j) -#define isl_int_mul_ui(r,i,j) mpz_mul_ui(r,i,j) -#define isl_int_pow_ui(r,i,j) mpz_pow_ui(r,i,j) -#define isl_int_addmul(r,i,j) mpz_addmul(r,i,j) -#define isl_int_submul(r,i,j) mpz_submul(r,i,j) - -#define isl_int_gcd(r,i,j) mpz_gcd(r,i,j) -#define isl_int_lcm(r,i,j) mpz_lcm(r,i,j) -#define isl_int_divexact(r,i,j) mpz_divexact(r,i,j) -#define isl_int_divexact_ui(r,i,j) mpz_divexact_ui(r,i,j) -#define isl_int_tdiv_q(r,i,j) mpz_tdiv_q(r,i,j) -#define isl_int_cdiv_q(r,i,j) mpz_cdiv_q(r,i,j) -#define isl_int_fdiv_q(r,i,j) mpz_fdiv_q(r,i,j) -#define isl_int_fdiv_r(r,i,j) mpz_fdiv_r(r,i,j) -#define isl_int_fdiv_q_ui(r,i,j) mpz_fdiv_q_ui(r,i,j) - -#define isl_int_read(r,s) mpz_set_str(r,s,10) -#define isl_int_print(out,i,width) \ - do { \ - char *s; \ - s = mpz_get_str(0, 10, i); \ - fprintf(out, "%*s", width, s); \ - isl_int_free_str(s); \ - } while (0) - -#define isl_int_sgn(i) mpz_sgn(i) -#define isl_int_cmp(i,j) mpz_cmp(i,j) -#define isl_int_cmp_si(i,si) mpz_cmp_si(i,si) -#define isl_int_eq(i,j) (mpz_cmp(i,j) == 0) -#define isl_int_ne(i,j) (mpz_cmp(i,j) != 0) -#define isl_int_lt(i,j) (mpz_cmp(i,j) < 0) -#define isl_int_le(i,j) (mpz_cmp(i,j) <= 0) -#define isl_int_gt(i,j) (mpz_cmp(i,j) > 0) -#define isl_int_ge(i,j) (mpz_cmp(i,j) >= 0) -#define isl_int_abs_eq(i,j) (mpz_cmpabs(i,j) == 0) -#define isl_int_abs_ne(i,j) (mpz_cmpabs(i,j) != 0) -#define isl_int_abs_lt(i,j) (mpz_cmpabs(i,j) < 0) -#define isl_int_abs_gt(i,j) (mpz_cmpabs(i,j) > 0) -#define isl_int_abs_ge(i,j) (mpz_cmpabs(i,j) >= 0) - - -#define isl_int_is_zero(i) (isl_int_sgn(i) == 0) -#define isl_int_is_one(i) (isl_int_cmp_si(i,1) == 0) -#define isl_int_is_negone(i) (isl_int_cmp_si(i,-1) == 0) -#define isl_int_is_pos(i) (isl_int_sgn(i) > 0) -#define isl_int_is_neg(i) (isl_int_sgn(i) < 0) -#define isl_int_is_nonpos(i) (isl_int_sgn(i) <= 0) -#define isl_int_is_nonneg(i) (isl_int_sgn(i) >= 0) -#define isl_int_is_divisible_by(i,j) mpz_divisible_p(i,j) - -uint32_t isl_gmp_hash(mpz_t v, uint32_t hash); -#define isl_int_hash(v,h) isl_gmp_hash(v,h) - -#if defined(__cplusplus) -} -#endif - -#if defined(__cplusplus) -extern "C" { typedef void (*isl_gmp_free_t)(void *, size_t); } - -static inline std::ostream &operator<<(std::ostream &os, isl_int i) -{ - char *s; - s = mpz_get_str(0, 10, i); - os << s; - isl_int_free_str(s); - return os; -} -#endif - -#endif diff --git a/include/isl/deprecated/map_int.h b/include/isl/deprecated/map_int.h deleted file mode 100644 index c120c40e..00000000 --- a/include/isl/deprecated/map_int.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef ISL_DEPRECATED_MAP_INT_H -#define ISL_DEPRECATED_MAP_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -isl_bool isl_basic_map_plain_is_fixed(__isl_keep isl_basic_map *bmap, - enum isl_dim_type type, unsigned pos, isl_int *val); - -__isl_give isl_map *isl_map_fix(__isl_take isl_map *map, - enum isl_dim_type type, unsigned pos, isl_int value); -isl_bool isl_map_plain_is_fixed(__isl_keep isl_map *map, - enum isl_dim_type type, unsigned pos, isl_int *val); - -__isl_give isl_map *isl_map_fixed_power(__isl_take isl_map *map, isl_int exp); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/mat_int.h b/include/isl/deprecated/mat_int.h deleted file mode 100644 index efacd4e5..00000000 --- a/include/isl/deprecated/mat_int.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ISL_DEPRECATED_MAT_INT_H -#define ISL_DEPRECATED_MAT_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -int isl_mat_get_element(__isl_keep isl_mat *mat, int row, int col, isl_int *v); -__isl_give isl_mat *isl_mat_set_element(__isl_take isl_mat *mat, - int row, int col, isl_int v); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/point_int.h b/include/isl/deprecated/point_int.h deleted file mode 100644 index 2e1a98b6..00000000 --- a/include/isl/deprecated/point_int.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ISL_DEPRECATED_POINT_INT_H -#define ISL_DEPRECATED_POINT_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -int isl_point_get_coordinate(__isl_keep isl_point *pnt, - enum isl_dim_type type, int pos, isl_int *v); -__isl_give isl_point *isl_point_set_coordinate(__isl_take isl_point *pnt, - enum isl_dim_type type, int pos, isl_int v); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/polynomial_int.h b/include/isl/deprecated/polynomial_int.h deleted file mode 100644 index b86fcf29..00000000 --- a/include/isl/deprecated/polynomial_int.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef ISL_DEPRECATED_POLYNOMIAL_INT_H -#define ISL_DEPRECATED_POLYNOMIAL_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -__isl_give isl_qpolynomial *isl_qpolynomial_rat_cst_on_domain( - __isl_take isl_space *space, const isl_int n, const isl_int d); -int isl_qpolynomial_is_cst(__isl_keep isl_qpolynomial *qp, - isl_int *n, isl_int *d); -__isl_give isl_qpolynomial *isl_qpolynomial_scale( - __isl_take isl_qpolynomial *qp, isl_int v); - -void isl_term_get_num(__isl_keep isl_term *term, isl_int *n); -void isl_term_get_den(__isl_keep isl_term *term, isl_int *d); - -__isl_give isl_qpolynomial_fold *isl_qpolynomial_fold_scale( - __isl_take isl_qpolynomial_fold *fold, isl_int v); - -__isl_give isl_pw_qpolynomial_fold *isl_pw_qpolynomial_fold_fix_dim( - __isl_take isl_pw_qpolynomial_fold *pwf, - enum isl_dim_type type, unsigned n, isl_int v); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/set_int.h b/include/isl/deprecated/set_int.h deleted file mode 100644 index 6f9ed068..00000000 --- a/include/isl/deprecated/set_int.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef ISL_DEPRECATED_SET_INT_H -#define ISL_DEPRECATED_SET_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -__isl_give isl_basic_set *isl_basic_set_fix(__isl_take isl_basic_set *bset, - enum isl_dim_type type, unsigned pos, isl_int value); -__isl_give isl_set *isl_set_lower_bound(__isl_take isl_set *set, - enum isl_dim_type type, unsigned pos, isl_int value); -__isl_give isl_set *isl_set_upper_bound(__isl_take isl_set *set, - enum isl_dim_type type, unsigned pos, isl_int value); -__isl_give isl_set *isl_set_fix(__isl_take isl_set *set, - enum isl_dim_type type, unsigned pos, isl_int value); - -isl_bool isl_set_plain_is_fixed(__isl_keep isl_set *set, - enum isl_dim_type type, unsigned pos, isl_int *val); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/union_map_int.h b/include/isl/deprecated/union_map_int.h deleted file mode 100644 index 4a57997a..00000000 --- a/include/isl/deprecated/union_map_int.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ISL_DEPRECATED_UNION_MAP_INT_H -#define ISL_DEPRECATED_UNION_MAP_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -__isl_give isl_union_map *isl_union_map_fixed_power( - __isl_take isl_union_map *umap, isl_int exp); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/val_int.h b/include/isl/deprecated/val_int.h deleted file mode 100644 index ef2eba22..00000000 --- a/include/isl/deprecated/val_int.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ISL_DEPRECATED_VAL_INT_H -#define ISL_DEPRECATED_VAL_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -__isl_give isl_val *isl_val_int_from_isl_int(isl_ctx *ctx, isl_int n); -int isl_val_get_num_isl_int(__isl_keep isl_val *v, isl_int *n); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/include/isl/deprecated/vec_int.h b/include/isl/deprecated/vec_int.h deleted file mode 100644 index c072997a..00000000 --- a/include/isl/deprecated/vec_int.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISL_DEPRECATED_VEC_INT_H -#define ISL_DEPRECATED_VEC_INT_H - -#include -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -int isl_vec_get_element(__isl_keep isl_vec *vec, int pos, isl_int *v); -__isl_give isl_vec *isl_vec_set_element(__isl_take isl_vec *vec, - int pos, isl_int v); - -__isl_give isl_vec *isl_vec_set(__isl_take isl_vec *vec, isl_int v); -__isl_give isl_vec *isl_vec_fdiv_r(__isl_take isl_vec *vec, isl_int m); - -#if defined(__cplusplus) -} -#endif - -#endif diff --git a/isl_aff.c b/isl_aff.c index 8b3f82bb..8e6f2877 100644 --- a/isl_aff.c +++ b/isl_aff.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #undef BASE @@ -565,21 +564,6 @@ __isl_give isl_val *isl_aff_get_denominator_val(__isl_keep isl_aff *aff) return isl_val_int_from_isl_int(ctx, aff->v->el[0]); } -/* Return the constant term of "aff" in "v". - * - * We cannot return anything meaningful in case of a NaN. - */ -int isl_aff_get_constant(__isl_keep isl_aff *aff, isl_int *v) -{ - if (!aff) - return -1; - if (isl_aff_is_nan(aff)) - isl_die(isl_aff_get_ctx(aff), isl_error_invalid, - "cannot get constant term of NaN", return -1); - isl_int_set(*v, aff->v->el[1]); - return 0; -} - /* Return the constant term of "aff". */ __isl_give isl_val *isl_aff_get_constant_val(__isl_keep isl_aff *aff) @@ -598,37 +582,6 @@ __isl_give isl_val *isl_aff_get_constant_val(__isl_keep isl_aff *aff) } /* Return the coefficient of the variable of type "type" at position "pos" - * of "aff" in "v". - * - * We cannot return anything meaningful in case of a NaN. - */ -int isl_aff_get_coefficient(__isl_keep isl_aff *aff, - enum isl_dim_type type, int pos, isl_int *v) -{ - if (!aff) - return -1; - - if (type == isl_dim_out) - isl_die(aff->v->ctx, isl_error_invalid, - "output/set dimension does not have a coefficient", - return -1); - if (type == isl_dim_in) - type = isl_dim_set; - - if (pos >= isl_local_space_dim(aff->ls, type)) - isl_die(aff->v->ctx, isl_error_invalid, - "position out of bounds", return -1); - - if (isl_aff_is_nan(aff)) - isl_die(isl_aff_get_ctx(aff), isl_error_invalid, - "cannot get coefficient of NaN", return -1); - pos += isl_local_space_offset(aff->ls, type); - isl_int_set(*v, aff->v->el[1 + pos]); - - return 0; -} - -/* Return the coefficient of the variable of type "type" at position "pos" * of "aff". */ __isl_give isl_val *isl_aff_get_coefficient_val(__isl_keep isl_aff *aff, @@ -686,29 +639,6 @@ int isl_aff_coefficient_sgn(__isl_keep isl_aff *aff, enum isl_dim_type type, return isl_int_sgn(aff->v->el[1 + pos]); } -/* Replace the denominator of "aff" by "v". - * - * A NaN is unaffected by this operation. - */ -__isl_give isl_aff *isl_aff_set_denominator(__isl_take isl_aff *aff, isl_int v) -{ - if (!aff) - return NULL; - if (isl_aff_is_nan(aff)) - return aff; - aff = isl_aff_cow(aff); - if (!aff) - return NULL; - - aff->v = isl_vec_cow(aff->v); - if (!aff->v) - return isl_aff_free(aff); - - isl_int_set(aff->v->el[0], v); - - return aff; -} - /* Replace the numerator of the constant term of "aff" by "v". * * A NaN is unaffected by this operation. @@ -1551,23 +1481,6 @@ __isl_give isl_aff *isl_aff_floor(__isl_take isl_aff *aff) /* Compute * * aff mod m = aff - m * floor(aff/m) - */ -__isl_give isl_aff *isl_aff_mod(__isl_take isl_aff *aff, isl_int m) -{ - isl_aff *res; - - res = isl_aff_copy(aff); - aff = isl_aff_scale_down(aff, m); - aff = isl_aff_floor(aff); - aff = isl_aff_scale(aff, m); - res = isl_aff_sub(res, aff); - - return res; -} - -/* Compute - * - * aff mod m = aff - m * floor(aff/m) * * with m an integer value. */ diff --git a/isl_aff_private.h b/isl_aff_private.h index 91acaa83..8ee5b00e 100644 --- a/isl_aff_private.h +++ b/isl_aff_private.h @@ -73,7 +73,6 @@ __isl_give isl_aff *isl_aff_reset_domain_space(__isl_take isl_aff *aff, __isl_give isl_aff *isl_aff_realign_domain(__isl_take isl_aff *aff, __isl_take isl_reordering *r); -int isl_aff_get_constant(__isl_keep isl_aff *aff, isl_int *v); __isl_give isl_aff *isl_aff_set_constant(__isl_take isl_aff *aff, isl_int v); __isl_give isl_aff *isl_aff_set_coefficient(__isl_take isl_aff *aff, enum isl_dim_type type, int pos, isl_int v); diff --git a/isl_ast_int.c b/isl_ast_int.c deleted file mode 100644 index 178c38cf..00000000 --- a/isl_ast_int.c +++ /dev/null @@ -1,13 +0,0 @@ -#include -#include -#include - -int isl_ast_expr_get_int(__isl_keep isl_ast_expr *expr, isl_int *v) -{ - if (!expr) - return -1; - if (expr->type != isl_ast_expr_int) - isl_die(isl_ast_expr_get_ctx(expr), isl_error_invalid, - "expression not an int", return -1); - return isl_val_get_num_isl_int(expr->u.v, v); -} diff --git a/isl_constraint.c b/isl_constraint.c index 92a6bb89..f1b0b4ee 100644 --- a/isl_constraint.c +++ b/isl_constraint.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/isl_constraint_private.h b/isl_constraint_private.h index 26a86303..82f41df1 100644 --- a/isl_constraint_private.h +++ b/isl_constraint_private.h @@ -25,10 +25,5 @@ void isl_constraint_get_constant(__isl_keep isl_constraint *constraint, isl_int *v); void isl_constraint_get_coefficient(__isl_keep isl_constraint *constraint, enum isl_dim_type type, int pos, isl_int *v); -__isl_give isl_constraint *isl_constraint_set_constant( - __isl_take isl_constraint *constraint, isl_int v); -__isl_give isl_constraint *isl_constraint_set_coefficient( - __isl_take isl_constraint *constraint, - enum isl_dim_type type, int pos, isl_int v); #endif diff --git a/isl_fold.c b/isl_fold.c index 1ba88150..be5c7f75 100644 --- a/isl_fold.c +++ b/isl_fold.c @@ -20,7 +20,6 @@ #include #include #include -#include enum isl_fold isl_fold_type_negate(enum isl_fold type) { diff --git a/isl_hide_deprecated.h b/isl_hide_deprecated.h deleted file mode 100644 index 344a3686..00000000 --- a/isl_hide_deprecated.h +++ /dev/null @@ -1,52 +0,0 @@ -#define isl_aff_get_constant isl_gmp_aff_get_constant -#define isl_aff_get_coefficient isl_gmp_aff_get_coefficient -#define isl_aff_get_denominator isl_gmp_aff_get_denominator -#define isl_aff_set_constant isl_gmp_aff_set_constant -#define isl_aff_set_coefficient isl_gmp_aff_set_coefficient -#define isl_aff_set_denominator isl_gmp_aff_set_denominator -#define isl_aff_add_constant isl_gmp_aff_add_constant -#define isl_aff_add_constant_num isl_gmp_aff_add_constant_num -#define isl_aff_add_coefficient isl_gmp_aff_add_coefficient -#define isl_aff_mod isl_gmp_aff_mod -#define isl_aff_scale isl_gmp_aff_scale -#define isl_aff_scale_down isl_gmp_aff_scale_down -#define isl_pw_aff_mod isl_gmp_pw_aff_mod -#define isl_pw_aff_scale isl_gmp_pw_aff_scale -#define isl_pw_aff_scale_down isl_gmp_pw_aff_scale_down -#define isl_multi_aff_scale isl_gmp_multi_aff_scale -#define isl_ast_expr_get_int isl_gmp_ast_expr_get_int -#define isl_constraint_get_constant isl_gmp_constraint_get_constant -#define isl_constraint_get_coefficient isl_gmp_constraint_get_coefficient -#define isl_constraint_set_constant isl_gmp_constraint_set_constant -#define isl_constraint_set_coefficient isl_gmp_constraint_set_coefficient -#define isl_basic_set_max isl_gmp_basic_set_max -#define isl_set_min isl_gmp_set_min -#define isl_set_max isl_gmp_set_max -#define isl_gmp_hash isl_gmp_gmp_hash -#define isl_basic_map_plain_is_fixed isl_gmp_basic_map_plain_is_fixed -#define isl_map_fix isl_gmp_map_fix -#define isl_map_plain_is_fixed isl_gmp_map_plain_is_fixed -#define isl_map_fixed_power isl_gmp_map_fixed_power -#define isl_mat_get_element isl_gmp_mat_get_element -#define isl_mat_set_element isl_gmp_mat_set_element -#define isl_point_get_coordinate isl_gmp_point_get_coordinate -#define isl_point_set_coordinate isl_gmp_point_set_coordinate -#define isl_qpolynomial_rat_cst_on_domain isl_gmp_qpolynomial_rat_cst_on_domain -#define isl_qpolynomial_is_cst isl_gmp_qpolynomial_is_cst -#define isl_qpolynomial_scale isl_gmp_qpolynomial_scale -#define isl_term_get_num isl_gmp_term_get_num -#define isl_term_get_den isl_gmp_term_get_den -#define isl_qpolynomial_fold_scale isl_gmp_qpolynomial_fold_scale -#define isl_pw_qpolynomial_fold_fix_dim isl_gmp_pw_qpolynomial_fold_fix_dim -#define isl_basic_set_fix isl_gmp_basic_set_fix -#define isl_set_lower_bound isl_gmp_set_lower_bound -#define isl_set_upper_bound isl_gmp_set_upper_bound -#define isl_set_fix isl_gmp_set_fix -#define isl_set_plain_is_fixed isl_gmp_set_plain_is_fixed -#define isl_union_map_fixed_power isl_gmp_union_map_fixed_power -#define isl_val_int_from_isl_int isl_gmp_val_int_from_isl_int -#define isl_val_get_num_isl_int isl_gmp_val_get_num_isl_int -#define isl_vec_get_element isl_gmp_vec_get_element -#define isl_vec_set_element isl_gmp_vec_set_element -#define isl_vec_set isl_gmp_vec_set -#define isl_vec_fdiv_r isl_gmp_vec_fdiv_r diff --git a/isl_ilp.c b/isl_ilp.c index eee294ea..ce49fc5d 100644 --- a/isl_ilp.c +++ b/isl_ilp.c @@ -21,7 +21,6 @@ #include #include #include -#include /* Given a basic set "bset", construct a basic set U such that for * each element x in U, the whole unit box positioned at x is inside @@ -506,24 +505,6 @@ enum isl_lp_result isl_set_opt(__isl_keep isl_set *set, int max, return res; } -enum isl_lp_result isl_basic_set_max(__isl_keep isl_basic_set *bset, - __isl_keep isl_aff *obj, isl_int *opt) -{ - return isl_basic_set_opt(bset, 1, obj, opt); -} - -enum isl_lp_result isl_set_max(__isl_keep isl_set *set, - __isl_keep isl_aff *obj, isl_int *opt) -{ - return isl_set_opt(set, 1, obj, opt); -} - -enum isl_lp_result isl_set_min(__isl_keep isl_set *set, - __isl_keep isl_aff *obj, isl_int *opt) -{ - return isl_set_opt(set, 0, obj, opt); -} - /* Convert the result of a function that returns an isl_lp_result * to an isl_val. The numerator of "v" is set to the optimal value * if lp_res is isl_lp_ok. "max" is set if a maximum was computed. diff --git a/isl_int_imath.h b/isl_int_imath.h index 73d6379d..ed314b65 100644 --- a/isl_int_imath.h +++ b/isl_int_imath.h @@ -1,8 +1,6 @@ #ifndef ISL_INT_IMATH_H #define ISL_INT_IMATH_H -#include "isl_hide_deprecated.h" - #include /* isl_int is the basic integer type, implemented with imath's mp_int. */ diff --git a/isl_map.c b/isl_map.c index 61f9c6f0..47e7acd7 100644 --- a/isl_map.c +++ b/isl_map.c @@ -43,8 +43,6 @@ #include #include #include -#include -#include #include #include @@ -9370,12 +9368,6 @@ __isl_give isl_val *isl_set_plain_get_val_if_fixed(__isl_keep isl_set *set, return isl_map_plain_get_val_if_fixed(set, type, pos); } -isl_bool isl_set_plain_is_fixed(__isl_keep isl_set *set, - enum isl_dim_type type, unsigned pos, isl_int *val) -{ - return isl_map_plain_is_fixed(set, type, pos, val); -} - /* Check if dimension dim has fixed value and if so and if val is not NULL, * then return this fixed value in *val. */ diff --git a/isl_map_private.h b/isl_map_private.h index bfd071c4..cfe72729 100644 --- a/isl_map_private.h +++ b/isl_map_private.h @@ -531,8 +531,6 @@ __isl_give isl_basic_map *isl_basic_map_shift_div( __isl_give isl_basic_map_list *isl_map_get_basic_map_list( __isl_keep isl_map *map); -__isl_give isl_map *isl_map_fixed_power(__isl_take isl_map *map, isl_int exp); - int isl_basic_set_count_upto(__isl_keep isl_basic_set *bset, isl_int max, isl_int *count); int isl_set_count_upto(__isl_keep isl_set *set, isl_int max, isl_int *count); diff --git a/isl_mat.c b/isl_mat.c index 9ce38d8d..ab117f0c 100644 --- a/isl_mat.c +++ b/isl_mat.c @@ -21,7 +21,6 @@ #include #include #include -#include isl_ctx *isl_mat_get_ctx(__isl_keep isl_mat *mat) { diff --git a/isl_point.c b/isl_point.c index 48534edd..2d5b306b 100644 --- a/isl_point.c +++ b/isl_point.c @@ -9,7 +9,6 @@ #include #include #include -#include #include @@ -133,23 +132,6 @@ isl_bool isl_point_is_void(__isl_keep isl_point *pnt) return pnt->vec->size == 0; } -int isl_point_get_coordinate(__isl_keep isl_point *pnt, - enum isl_dim_type type, int pos, isl_int *v) -{ - if (!pnt || isl_point_is_void(pnt)) - return -1; - - if (pos < 0 || pos >= isl_space_dim(pnt->dim, type)) - isl_die(isl_point_get_ctx(pnt), isl_error_invalid, - "position out of bounds", return -1); - - if (type == isl_dim_set) - pos += isl_space_dim(pnt->dim, isl_dim_param); - isl_int_set(*v, pnt->vec->el[1 + pos]); - - return 0; -} - /* Return the value of coordinate "pos" of type "type" of "pnt". */ __isl_give isl_val *isl_point_get_coordinate_val(__isl_keep isl_point *pnt, @@ -177,30 +159,6 @@ __isl_give isl_val *isl_point_get_coordinate_val(__isl_keep isl_point *pnt, return isl_val_normalize(v); } -__isl_give isl_point *isl_point_set_coordinate(__isl_take isl_point *pnt, - enum isl_dim_type type, int pos, isl_int v) -{ - if (!pnt || isl_point_is_void(pnt)) - return pnt; - - pnt = isl_point_cow(pnt); - if (!pnt) - return NULL; - pnt->vec = isl_vec_cow(pnt->vec); - if (!pnt->vec) - goto error; - - if (type == isl_dim_set) - pos += isl_space_dim(pnt->dim, isl_dim_param); - - isl_int_set(pnt->vec->el[1 + pos], v); - - return pnt; -error: - isl_point_free(pnt); - return NULL; -} - /* Replace coordinate "pos" of type "type" of "pnt" by "v". */ __isl_give isl_point *isl_point_set_coordinate_val(__isl_take isl_point *pnt, diff --git a/isl_polynomial.c b/isl_polynomial.c index 2f4ba43d..c7c0f62d 100644 --- a/isl_polynomial.c +++ b/isl_polynomial.c @@ -28,7 +28,6 @@ #include #include #include -#include static unsigned pos(__isl_keep isl_space *dim, enum isl_dim_type type) { @@ -3856,13 +3855,6 @@ void isl_term_get_num(__isl_keep isl_term *term, isl_int *n) isl_int_set(*n, term->n); } -void isl_term_get_den(__isl_keep isl_term *term, isl_int *d) -{ - if (!term) - return; - isl_int_set(*d, term->d); -} - /* Return the coefficient of the term "term". */ __isl_give isl_val *isl_term_get_coefficient_val(__isl_keep isl_term *term) diff --git a/isl_union_map.c b/isl_union_map.c index 2f55f1f2..02378a85 100644 --- a/isl_union_map.c +++ b/isl_union_map.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/isl_union_templ.c b/isl_union_templ.c index 85f0570b..b2ad551e 100644 --- a/isl_union_templ.c +++ b/isl_union_templ.c @@ -870,38 +870,6 @@ static __isl_give UNION *FN(UNION,negate_type)(__isl_take UNION *u) } #endif -static __isl_give PART *FN(UNION,mul_isl_int_entry)(__isl_take PART *part, - void *user) -{ - isl_int *v = user; - - return FN(PW,mul_isl_int)(part, *v); -} - -__isl_give UNION *FN(UNION,mul_isl_int)(__isl_take UNION *u, isl_int v) -{ - if (isl_int_is_one(v)) - return u; - - if (DEFAULT_IS_ZERO && u && isl_int_is_zero(v)) { - UNION *zero; - isl_space *dim = FN(UNION,get_space)(u); -#ifdef HAS_TYPE - zero = FN(UNION,ZERO)(dim, u->type); -#else - zero = FN(UNION,ZERO)(dim); -#endif - FN(UNION,free)(u); - return zero; - } - - u = FN(UNION,transform_inplace)(u, &FN(UNION,mul_isl_int_entry), &v); - if (isl_int_is_neg(v)) - u = FN(UNION,negate_type)(u); - - return u; -} - /* Multiply "part" by the isl_val "user" and return the result. */ static __isl_give PART *FN(UNION,scale_val_entry)(__isl_take PART *part, diff --git a/isl_vec.c b/isl_vec.c index 6e9ed0f3..4d5bed78 100644 --- a/isl_vec.c +++ b/isl_vec.c @@ -13,7 +13,6 @@ #include #include #include -#include isl_ctx *isl_vec_get_ctx(__isl_keep isl_vec *vec) { @@ -251,18 +250,6 @@ int isl_vec_size(__isl_keep isl_vec *vec) return vec ? vec->size : -1; } -int isl_vec_get_element(__isl_keep isl_vec *vec, int pos, isl_int *v) -{ - if (!vec) - return -1; - - if (pos < 0 || pos >= vec->size) - isl_die(vec->ctx, isl_error_invalid, "position out of range", - return -1); - isl_int_set(*v, vec->el[pos]); - return 0; -} - /* Extract the element at position "pos" of "vec". */ __isl_give isl_val *isl_vec_get_element_val(__isl_keep isl_vec *vec, int pos) -- 2.11.4.GIT