isl_map_gist_basic_map: remove alignment of context divs with all basic maps

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

diff --git a/isl_ast.c b/isl_ast.c
index 6859e7f..5885e41 100644 (file)
--- a/isl_ast.c
+++ b/isl_ast.c
@@ -1,4 +1,5 @@
 #include <isl_ast_private.h>
+#include <isl/val_int.h>
 
 #undef BASE
 #define BASE ast_expr
@@ -153,7 +154,7 @@ __isl_give isl_ast_expr *isl_ast_expr_dup(__isl_keep isl_ast_expr *expr)
        ctx = isl_ast_expr_get_ctx(expr);
        switch (expr->type) {
        case isl_ast_expr_int:
-               dup = isl_ast_expr_alloc_int(ctx, expr->u.i);
+               dup = isl_ast_expr_from_val(isl_val_copy(expr->u.v));
                break;
        case isl_ast_expr_id:
                dup = isl_ast_expr_from_id(isl_id_copy(expr->u.id));
@@ -202,7 +203,7 @@ void *isl_ast_expr_free(__isl_take isl_ast_expr *expr)
 
        switch (expr->type) {
        case isl_ast_expr_int:
-               isl_int_clear(expr->u.i);
+               isl_val_free(expr->u.v);
                break;
        case isl_ast_expr_id:
                isl_id_free(expr->u.id);
@@ -237,8 +238,19 @@ int isl_ast_expr_get_int(__isl_keep isl_ast_expr *expr, isl_int *v)
        if (expr->type != isl_ast_expr_int)
                isl_die(isl_ast_expr_get_ctx(expr), isl_error_invalid,
                        "expression not an int", return -1);
-       isl_int_set(*v, expr->u.i);
-       return 0;
+       return isl_val_get_num_isl_int(expr->u.v, v);
+}
+
+/* Return the integer value represented by "expr".
+ */
+__isl_give isl_val *isl_ast_expr_get_val(__isl_keep isl_ast_expr *expr)
+{
+       if (!expr)
+               return NULL;
+       if (expr->type != isl_ast_expr_int)
+               isl_die(isl_ast_expr_get_ctx(expr), isl_error_invalid,
+                       "expression not an int", return NULL);
+       return isl_val_copy(expr->u.v);
 }
 
 __isl_give isl_id *isl_ast_expr_get_id(__isl_keep isl_ast_expr *expr)
@@ -375,30 +387,36 @@ __isl_give isl_ast_expr *isl_ast_expr_alloc_int_si(isl_ctx *ctx, int i)
        isl_ctx_ref(ctx);
        expr->ref = 1;
        expr->type = isl_ast_expr_int;
-
-       isl_int_init(expr->u.i);
-       isl_int_set_si(expr->u.i, i);
+       expr->u.v = isl_val_int_from_si(ctx, i);
+       if (!expr->u.v)
+               return isl_ast_expr_free(expr);
 
        return expr;
 }
 
-/* Create a new integer expression representing "i".
+/* Create a new integer expression representing "v".
  */
-__isl_give isl_ast_expr *isl_ast_expr_alloc_int(isl_ctx *ctx, isl_int i)
+__isl_give isl_ast_expr *isl_ast_expr_from_val(__isl_take isl_val *v)
 {
+       isl_ctx *ctx;
        isl_ast_expr *expr;
 
+       if (!v)
+               return NULL;
+       if (!isl_val_is_int(v))
+               isl_die(isl_val_get_ctx(v), isl_error_invalid,
+                       "expecting integer value", return isl_val_free(v));
+
+       ctx = isl_val_get_ctx(v);
        expr = isl_calloc_type(ctx, isl_ast_expr);
        if (!expr)
-               return NULL;
+               return isl_val_free(v);
 
        expr->ctx = ctx;
        isl_ctx_ref(ctx);
        expr->ref = 1;
        expr->type = isl_ast_expr_int;
-
-       isl_int_init(expr->u.i);
-       isl_int_set(expr->u.i, i);
+       expr->u.v = v;
 
        return expr;
 }
@@ -1231,7 +1249,7 @@ __isl_give isl_printer *isl_printer_print_ast_expr(__isl_take isl_printer *p,
                p = isl_printer_print_str(p, isl_id_get_name(expr->u.id));
                break;
        case isl_ast_expr_int:
-               p = isl_printer_print_isl_int(p, expr->u.i);
+               p = isl_printer_print_val(p, expr->u.v);
                break;
        case isl_ast_expr_error:
                break;