hide isl_vec internals

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>

35 files changed, 54 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index 7698e27d..50aac46b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,6 +141,7 @@ libisl_la_SOURCES = \
 	isl_val.c \
 	isl_val_gmp.c \
 	isl_val_private.h \
+	isl_vec_private.h \
 	isl_vec.c \
 	isl_version.c \
 	isl_vertices_private.h \
diff --git a/basis_reduction_templ.c b/basis_reduction_templ.c
index 7f4b28f0..98d81413 100644
--- a/basis_reduction_templ.c
+++ b/basis_reduction_templ.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <isl_ctx_private.h>
 #include <isl_map_private.h>
+#include <isl_vec_private.h>
 #include <isl_options_private.h>
 #include "isl_basis_reduction.h"
 
diff --git a/include/isl/printer.h b/include/isl/printer.h
index 0979fc29..be748dd6 100644
--- a/include/isl/printer.h
+++ b/include/isl/printer.h
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <isl/ctx.h>
+#include <isl/int.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/include/isl/vec.h b/include/isl/vec.h
index ad1309cb..63ed6cf9 100644
--- a/include/isl/vec.h
+++ b/include/isl/vec.h
@@ -12,9 +12,7 @@
 
 #include <stdio.h>
 
-#include <isl/int.h>
 #include <isl/ctx.h>
-#include <isl/blk.h>
 #include <isl/val.h>
 #include <isl/printer.h>
 
@@ -22,21 +20,11 @@
 extern "C" {
 #endif
 
-struct isl_vec {
-	int ref;
-
-	struct isl_ctx *ctx;
-
-	unsigned size;
-	isl_int *el;
-
-	struct isl_blk block;
-};
+struct isl_vec;
 typedef struct isl_vec isl_vec;
 
 __isl_give isl_vec *isl_vec_alloc(isl_ctx *ctx, unsigned size);
 __isl_give isl_vec *isl_vec_copy(__isl_keep isl_vec *vec);
-struct isl_vec *isl_vec_cow(struct isl_vec *vec);
 void *isl_vec_free(__isl_take isl_vec *vec);
 
 isl_ctx *isl_vec_get_ctx(__isl_keep isl_vec *vec);
diff --git a/isl_aff.c b/isl_aff.c
index 6a491237..640b744e 100644
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -18,6 +18,7 @@
 #include <isl_aff_private.h>
 #include <isl_space_private.h>
 #include <isl_local_space_private.h>
+#include <isl_vec_private.h>
 #include <isl_mat_private.h>
 #include <isl/constraint.h>
 #include <isl_seq.h>
diff --git a/isl_affine_hull.c b/isl_affine_hull.c
index f38085ff..6ca58bbd 100644
--- a/isl_affine_hull.c
+++ b/isl_affine_hull.c
@@ -22,6 +22,7 @@
 #include "isl_sample.h"
 #include "isl_tab.h"
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 
 struct isl_basic_map *isl_basic_map_implicit_equalities(
 						struct isl_basic_map *bmap)
diff --git a/isl_bernstein.c b/isl_bernstein.c
index 32e1a09a..e0d2a41b 100644
--- a/isl_bernstein.c
+++ b/isl_bernstein.c
@@ -22,6 +22,7 @@
 #include <isl_vertices_private.h>
 #include <isl_polynomial_private.h>
 #include <isl_options_private.h>
+#include <isl_vec_private.h>
 #include <isl_bernstein.h>
 
 struct bernstein_data {
diff --git a/isl_coalesce.c b/isl_coalesce.c
index 763904db..16f38968 100644
--- a/isl_coalesce.c
+++ b/isl_coalesce.c
@@ -18,6 +18,7 @@
 #include "isl_tab.h"
 #include <isl_mat_private.h>
 #include <isl_local_space_private.h>
+#include <isl_vec_private.h>
 
 #define STATUS_ERROR		-1
 #define STATUS_REDUNDANT	 1
diff --git a/isl_constraint.c b/isl_constraint.c
index 50f532be..4a4d4cd8 100644
--- a/isl_constraint.c
+++ b/isl_constraint.c
@@ -17,6 +17,7 @@
 #include <isl_aff_private.h>
 #include <isl_local_space_private.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 #undef BASE
 #define BASE constraint
diff --git a/isl_convex_hull.c b/isl_convex_hull.c
index 67a93127..e87f1086 100644
--- a/isl_convex_hull.c
+++ b/isl_convex_hull.c
@@ -12,6 +12,7 @@
 #include <isl/lp.h>
 #include <isl/map.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl/set.h>
 #include <isl_seq.h>
 #include <isl_options_private.h>
diff --git a/isl_equalities.c b/isl_equalities.c
index 3974e522..25a1bf2f 100644
--- a/isl_equalities.c
+++ b/isl_equalities.c
@@ -11,6 +11,7 @@
  */
 
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_seq.h>
 #include "isl_map_private.h"
 #include "isl_equalities.h"
diff --git a/isl_fold.c b/isl_fold.c
index ec9f1033..9afd9583 100644
--- a/isl_fold.c
+++ b/isl_fold.c
@@ -18,6 +18,7 @@
 #include <isl_seq.h>
 #include <isl_mat_private.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 #include <isl_config.h>
 
 enum isl_fold isl_fold_type_negate(enum isl_fold type)
diff --git a/isl_ilp.c b/isl_ilp.c
index 8e227a7c..5b7f30eb 100644
--- a/isl_ilp.c
+++ b/isl_ilp.c
@@ -17,6 +17,7 @@
 #include <isl_local_space_private.h>
 #include <isl_mat_private.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 /* 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
diff --git a/isl_input.c b/isl_input.c
index 76b0d1d4..484cfdb9 100644
--- a/isl_input.c
+++ b/isl_input.c
@@ -25,6 +25,7 @@
 #include <isl/union_map.h>
 #include <isl_mat_private.h>
 #include <isl_aff_private.h>
+#include <isl_vec_private.h>
 #include <isl/list.h>
 #include <isl_val_private.h>
 
diff --git a/isl_local_space.c b/isl_local_space.c
index c843f16b..01b9c407 100644
--- a/isl_local_space.c
+++ b/isl_local_space.c
@@ -16,6 +16,7 @@
 #include <isl_space_private.h>
 #include <isl_mat_private.h>
 #include <isl_aff_private.h>
+#include <isl_vec_private.h>
 #include <isl_seq.h>
 
 isl_ctx *isl_local_space_get_ctx(__isl_keep isl_local_space *ls)
diff --git a/isl_lp.c b/isl_lp.c
index 07b3811e..61db58e0 100644
--- a/isl_lp.c
+++ b/isl_lp.c
@@ -18,6 +18,7 @@
 #include <isl_aff_private.h>
 #include <isl_mat_private.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 enum isl_lp_result isl_tab_solve_lp(struct isl_basic_map *bmap, int maximize,
 				      isl_int *f, isl_int denom, isl_int *opt,
diff --git a/isl_map.c b/isl_map.c
index ebf5bf99..bc64f648 100644
--- a/isl_map.c
+++ b/isl_map.c
@@ -28,6 +28,7 @@
 #include "isl_tab.h"
 #include <isl/vec.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_dim_map.h>
 #include <isl_local_space_private.h>
 #include <isl_aff_private.h>
diff --git a/isl_map_simplify.c b/isl_map_simplify.c
index 132acade..73fff9b3 100644
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
@@ -18,6 +18,7 @@
 #include "isl_tab.h"
 #include <isl_space_private.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 
 static void swap_equality(struct isl_basic_map *bmap, int a, int b)
 {
diff --git a/isl_map_subtract.c b/isl_map_subtract.c
index b0aa3594..9de5beb8 100644
--- a/isl_map_subtract.c
+++ b/isl_map_subtract.c
@@ -13,6 +13,7 @@
 #include <isl/map.h>
 #include "isl_tab.h"
 #include <isl_point_private.h>
+#include <isl_vec_private.h>
 
 /* Expand the constraint "c" into "v".  The initial "dim" dimensions
  * are the same, but "v" may have more divs than "c" and the divs of "c"
diff --git a/isl_mat.c b/isl_mat.c
index 657b333e..aa78c680 100644
--- a/isl_mat.c
+++ b/isl_mat.c
@@ -12,6 +12,7 @@
 #include <isl/space.h>
 #include <isl_seq.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_space_private.h>
 #include <isl_val_private.h>
 
diff --git a/isl_output.c b/isl_output.c
index 3d35040a..82d22b42 100644
--- a/isl_output.c
+++ b/isl_output.c
@@ -20,6 +20,7 @@
 #include <isl_printer_private.h>
 #include <isl_space_private.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl/union_map.h>
 #include <isl/constraint.h>
 #include <isl_local_space_private.h>
diff --git a/isl_point.c b/isl_point.c
index efcabcd0..495bcfcb 100644
--- a/isl_point.c
+++ b/isl_point.c
@@ -6,6 +6,7 @@
 #include <isl_seq.h>
 #include <isl_space_private.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 isl_ctx *isl_point_get_ctx(__isl_keep isl_point *pnt)
 {
diff --git a/isl_polynomial.c b/isl_polynomial.c
index b9cdc0e9..017db351 100644
--- a/isl_polynomial.c
+++ b/isl_polynomial.c
@@ -21,6 +21,7 @@
 #include <isl_point_private.h>
 #include <isl_space_private.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_range.h>
 #include <isl_local_space_private.h>
 #include <isl_aff_private.h>
diff --git a/isl_sample.c b/isl_sample.c
index cd841bfc..cc607ec0 100644
--- a/isl_sample.c
+++ b/isl_sample.c
@@ -20,6 +20,7 @@
 #include <isl_factorization.h>
 #include <isl_point_private.h>
 #include <isl_options_private.h>
+#include <isl_vec_private.h>
 
 static struct isl_vec *empty_sample(struct isl_basic_set *bset)
 {
diff --git a/isl_scan.c b/isl_scan.c
index 269f719d..eb8423c6 100644
--- a/isl_scan.c
+++ b/isl_scan.c
@@ -14,6 +14,7 @@
 #include <isl_seq.h>
 #include "isl_tab.h"
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 struct isl_counter {
 	struct isl_scan_callback callback;
diff --git a/isl_schedule.c b/isl_schedule.c
index e59f6e95..fccff793 100644
--- a/isl_schedule.c
+++ b/isl_schedule.c
@@ -18,6 +18,7 @@
 #include <isl/constraint.h>
 #include <isl/schedule.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl/set.h>
 #include <isl_seq.h>
 #include <isl_tab.h>
diff --git a/isl_tab.c b/isl_tab.c
index eda574c5..cc71fb4f 100644
--- a/isl_tab.c
+++ b/isl_tab.c
@@ -11,6 +11,7 @@
 
 #include <isl_ctx_private.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include "isl_map_private.h"
 #include "isl_tab.h"
 #include <isl_seq.h>
diff --git a/isl_tab_pip.c b/isl_tab_pip.c
index 31a7dc79..d2e34513 100644
--- a/isl_tab_pip.c
+++ b/isl_tab_pip.c
@@ -16,6 +16,7 @@
 #include "isl_tab.h"
 #include "isl_sample.h"
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_aff_private.h>
 #include <isl_options_private.h>
 #include <isl_config.h>
diff --git a/isl_transitive_closure.c b/isl_transitive_closure.c
index ee276871..e814d6f3 100644
--- a/isl_transitive_closure.c
+++ b/isl_transitive_closure.c
@@ -16,6 +16,7 @@
 #include <isl/lp.h>
 #include <isl/union_map.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 #include <isl_options_private.h>
 #include <isl_tarjan.h>
 
diff --git a/isl_vec.c b/isl_vec.c
index 82521173..c6cdc5bb 100644
--- a/isl_vec.c
+++ b/isl_vec.c
@@ -9,8 +9,8 @@
 
 #include <isl_ctx_private.h>
 #include <isl_seq.h>
-#include <isl/vec.h>
 #include <isl_val_private.h>
+#include <isl_vec_private.h>
 
 isl_ctx *isl_vec_get_ctx(__isl_keep isl_vec *vec)
 {
diff --git a/isl_vec_private.h b/isl_vec_private.h
new file mode 100644
index 00000000..8285be68
--- /dev/null
+++ b/isl_vec_private.h
@@ -0,0 +1,20 @@
+#ifndef ISL_VEC_PRIVATE_H
+#define ISL_VEC_PRIVATE_H
+
+#include <isl/blk.h>
+#include <isl/vec.h>
+
+struct isl_vec {
+	int ref;
+
+	struct isl_ctx *ctx;
+
+	unsigned size;
+	isl_int *el;
+
+	struct isl_blk block;
+};
+
+__isl_give isl_vec *isl_vec_cow(__isl_take isl_vec *vec);
+
+#endif
diff --git a/isl_vertices.c b/isl_vertices.c
index 1a136914..bcf33d1b 100644
--- a/isl_vertices.c
+++ b/isl_vertices.c
@@ -16,6 +16,7 @@
 #include <isl_morph.h>
 #include <isl_vertices_private.h>
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 
 #define SELECTED	1
 #define DESELECTED	-1
diff --git a/pip.c b/pip.c
index b2ee6dca..2b2ce986 100644
--- a/pip.c
+++ b/pip.c
@@ -20,6 +20,7 @@
 #include <isl/ilp.h>
 #include <isl/printer.h>
 #include <isl_point_private.h>
+#include <isl_vec_private.h>
 #include <isl/options.h>
 
 /* The input of this program is the same as that of the "example" program
diff --git a/polyhedron_minimize.c b/polyhedron_minimize.c
index 6cfab3bf..62e51c6e 100644
--- a/polyhedron_minimize.c
+++ b/polyhedron_minimize.c
@@ -12,6 +12,7 @@
 #include <isl/vec.h>
 #include <isl/ilp.h>
 #include <isl_seq.h>
+#include <isl_vec_private.h>
 
 /* The input of this program is the same as that of the "polytope_minimize"
  * program from the barvinok distribution.
diff --git a/polytope_scan.c b/polytope_scan.c
index 22363426..3fb3a4da 100644
--- a/polytope_scan.c
+++ b/polytope_scan.c
@@ -13,6 +13,7 @@
 #include <isl_seq.h>
 #include "isl_scan.h"
 #include <isl_mat_private.h>
+#include <isl_vec_private.h>
 
 /* The input of this program is the same as that of the "polytope_scan"
  * program from the barvinok distribution.