split off type declarations for isl_map and isl_set to separate files

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

diff --git a/Makefile.am b/Makefile.am
index 7019da0..5bb1ba3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,6 +205,7 @@ pkginclude_HEADERS = \
        include/isl/lp.h \
        include/isl/mat.h \
        include/isl/map.h \
+       include/isl/map_type.h \
        include/isl/obj.h \
        include/isl/options.h \
        include/isl/point.h \
@@ -213,6 +214,7 @@ pkginclude_HEADERS = \
        include/isl/schedule.h \
        include/isl/seq.h \
        include/isl/set.h \
+       include/isl/set_type.h \
        include/isl/stream.h \
        include/isl/union_map.h \
        include/isl/union_set.h \

diff --git a/include/isl/constraint.h b/include/isl/constraint.h
index f1ba6a8..96ad901 100644 (file)
--- a/include/isl/constraint.h
+++ b/include/isl/constraint.h
@@ -12,7 +12,7 @@
 
 #include <isl/aff.h>
 #include <isl/div.h>
-#include <isl/set.h>
+#include <isl/set_type.h>
 #include <isl/printer.h>
 
 #if defined(__cplusplus)

diff --git a/include/isl/flow.h b/include/isl/flow.h
index 839f142..9606fe9 100644 (file)
--- a/include/isl/flow.h
+++ b/include/isl/flow.h
@@ -1,8 +1,8 @@
 #ifndef ISL_FLOW_H
 #define ISL_FLOW_H
 
-#include <isl/set.h>
-#include <isl/map.h>
+#include <isl/set_type.h>
+#include <isl/map_type.h>
 #include <isl/union_set.h>
 #include <isl/union_map.h>
 

diff --git a/include/isl/lp.h b/include/isl/lp.h
index e6c38d7..9f7a912 100644 (file)
--- a/include/isl/lp.h
+++ b/include/isl/lp.h
@@ -10,8 +10,10 @@
 #ifndef ISL_LP_H
 #define ISL_LP_H
 
-#include <isl/map.h>
-#include <isl/set.h>
+#include <isl/int.h>
+#include <isl/vec.h>
+#include <isl/map_type.h>
+#include <isl/set_type.h>
 
 enum isl_lp_result {
        isl_lp_error = -1,

diff --git a/include/isl/map.h b/include/isl/map.h
index 0afcba3..c93907a 100644 (file)
--- a/include/isl/map.h
+++ b/include/isl/map.h
@@ -23,6 +23,7 @@
 #include <isl/local_space.h>
 #include <isl/aff.h>
 #include <isl/list.h>
+#include <isl/map_type.h>
 
 #if defined(__cplusplus)
 extern "C" {
@@ -42,19 +43,6 @@ extern "C" {
  * reference to the old structure(s), use the appropriate _copy function.
  */
 
-struct isl_basic_map;
-typedef struct isl_basic_map isl_basic_map;
-#ifndef isl_basic_set
-struct isl_basic_set;
-typedef struct isl_basic_set isl_basic_set;
-#endif
-struct isl_map;
-typedef struct isl_map isl_map;
-#ifndef isl_set
-struct isl_set;
-typedef struct isl_set isl_set;
-#endif
-
 unsigned isl_basic_map_n_in(const struct isl_basic_map *bmap);
 unsigned isl_basic_map_n_out(const struct isl_basic_map *bmap);
 unsigned isl_basic_map_n_param(const struct isl_basic_map *bmap);

diff --git a/include/isl/map_type.h b/include/isl/map_type.h
new file mode 100644 (file)
index 0000000..1ba26e0
--- /dev/null
+++ b/include/isl/map_type.h
@@ -0,0 +1,26 @@
+#ifndef ISL_MAP_TYPE_H
+#define ISL_MAP_TYPE_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+struct isl_basic_map;
+typedef struct isl_basic_map isl_basic_map;
+struct isl_map;
+typedef struct isl_map isl_map;
+
+#ifndef isl_basic_set
+struct isl_basic_set;
+typedef struct isl_basic_set isl_basic_set;
+#endif
+#ifndef isl_set
+struct isl_set;
+typedef struct isl_set isl_set;
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

diff --git a/include/isl/obj.h b/include/isl/obj.h
index e08040f..b2a6afc 100644 (file)
--- a/include/isl/obj.h
+++ b/include/isl/obj.h
@@ -1,8 +1,8 @@
 #ifndef ISL_OBJ_H
 #define ISL_OBJ_H
 
-#include <isl/set.h>
-#include <isl/map.h>
+#include <isl/set_type.h>
+#include <isl/map_type.h>
 #include <isl/union_set.h>
 #include <isl/union_map.h>
 #include <isl/polynomial.h>

diff --git a/include/isl/polynomial.h b/include/isl/polynomial.h
index f1315f6..6cc9083 100644 (file)
--- a/include/isl/polynomial.h
+++ b/include/isl/polynomial.h
@@ -5,7 +5,7 @@
 #include <isl/constraint.h>
 #include <isl/dim.h>
 #include <isl/div.h>
-#include <isl/set.h>
+#include <isl/set_type.h>
 #include <isl/point.h>
 #include <isl/printer.h>
 #include <isl/union_set.h>

diff --git a/include/isl/set.h b/include/isl/set.h
index 9c058a3..c5b43eb 100644 (file)
--- a/include/isl/set.h
+++ b/include/isl/set.h
@@ -10,8 +10,10 @@
 #ifndef ISL_SET_H
 #define ISL_SET_H
 
-#include <isl/map.h>
+#include <isl/map_type.h>
+#include <isl/aff.h>
 #include <isl/list.h>
+#include <isl/mat.h>
 #include <isl/point.h>
 #include <isl/local_space.h>
 

diff --git a/include/isl/set_type.h b/include/isl/set_type.h
new file mode 100644 (file)
index 0000000..ce349e1
--- /dev/null
+++ b/include/isl/set_type.h
@@ -0,0 +1,6 @@
+#ifndef ISL_SET_TYPE_H
+#define ISL_SET_TYPE_H
+
+#include <isl/map_type.h>
+
+#endif

diff --git a/include/isl/union_map.h b/include/isl/union_map.h
index b1b87bb..7f5d4c4 100644 (file)
--- a/include/isl/union_map.h
+++ b/include/isl/union_map.h
@@ -2,7 +2,7 @@
 #define ISL_UNION_MAP_H
 
 #include <isl/dim.h>
-#include <isl/map.h>
+#include <isl/map_type.h>
 #include <isl/printer.h>
 
 #if defined(__cplusplus)

diff --git a/include/isl/vertices.h b/include/isl/vertices.h
index fee5537..3e8460d 100644 (file)
--- a/include/isl/vertices.h
+++ b/include/isl/vertices.h
@@ -1,7 +1,7 @@
 #ifndef ISL_VERTICES_H
 #define ISL_VERTICES_H
 
-#include <isl/set.h>
+#include <isl/set_type.h>
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/isl_flow.c b/isl_flow.c
index d27937c..6dd6ff5 100644 (file)
--- a/isl_flow.c
+++ b/isl_flow.c
@@ -13,6 +13,8 @@
  * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France 
  */
 
+#include <isl/set.h>
+#include <isl/map.h>
 #include <isl/flow.h>
 
 /* A private structure to keep track of a mapping together with

diff --git a/isl_obj.c b/isl_obj.c
index fb9fe97..928982d 100644 (file)
--- a/isl_obj.c
+++ b/isl_obj.c
@@ -8,6 +8,8 @@
  * 91893 Orsay, France 
  */
 
+#include <isl/set.h>
+#include <isl/map.h>
 #include <isl/obj.h>
 
 struct isl_int_obj {