temporarily make isl_val_int_from_isl_int available

[platform/upstream/isl.git] / isl_scan.c

diff --git a/isl_scan.c b/isl_scan.c
index 05548b3..a7d2b9f 100644 (file)
--- a/isl_scan.c
+++ b/isl_scan.c
@@ -1,17 +1,19 @@
 /*
  * Copyright 2008-2009 Katholieke Universiteit Leuven
  *
- * Use of this software is governed by the GNU LGPLv2.1 license
+ * 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
  */
 
+#include <isl_ctx_private.h>
+#include <isl_map_private.h>
 #include "isl_basis_reduction.h"
 #include "isl_scan.h"
 #include <isl/seq.h>
 #include "isl_tab.h"
-#include <isl_map_private.h>
+#include <isl_val_private.h>
 
 struct isl_counter {
        struct isl_scan_callback callback;
@@ -123,7 +125,7 @@ int isl_basic_set_scan(struct isl_basic_set *bset,
        if (!min || !max || !snap)
                goto error;
 
-       tab = isl_tab_from_basic_set(bset);
+       tab = isl_tab_from_basic_set(bset, 0);
        if (!tab)
                goto error;
        if (isl_tab_extend_cons(tab, dim + 1) < 0)
@@ -242,6 +244,33 @@ error:
        return -1;
 }
 
+int isl_basic_set_count_upto(__isl_keep isl_basic_set *bset,
+       isl_int max, isl_int *count)
+{
+       struct isl_counter cnt = { { &increment_counter } };
+
+       if (!bset)
+               return -1;
+
+       isl_int_init(cnt.count);
+       isl_int_init(cnt.max);
+
+       isl_int_set_si(cnt.count, 0);
+       isl_int_set(cnt.max, max);
+       if (isl_basic_set_scan(isl_basic_set_copy(bset), &cnt.callback) < 0 &&
+           isl_int_lt(cnt.count, cnt.max))
+               goto error;
+
+       isl_int_set(*count, cnt.count);
+       isl_int_clear(cnt.max);
+       isl_int_clear(cnt.count);
+
+       return 0;
+error:
+       isl_int_clear(cnt.count);
+       return -1;
+}
+
 int isl_set_count_upto(__isl_keep isl_set *set, isl_int max, isl_int *count)
 {
        struct isl_counter cnt = { { &increment_counter } };
@@ -274,3 +303,21 @@ int isl_set_count(__isl_keep isl_set *set, isl_int *count)
                return -1;
        return isl_set_count_upto(set, set->ctx->zero, count);
 }
+
+/* Count the total number of elements in "set" (in an inefficient way) and
+ * return the result.
+ */
+__isl_give isl_val *isl_set_count_val(__isl_keep isl_set *set)
+{
+       isl_val *v;
+
+       if (!set)
+               return NULL;
+       v = isl_val_zero(isl_set_get_ctx(set));
+       v = isl_val_cow(v);
+       if (!v)
+               return NULL;
+       if (isl_set_count(set, &v->n) < 0)
+               v = isl_val_free(v);
+       return v;
+}