From fd9692ddc44d2488c5cf127735be8b851474b65c Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Mon, 22 Apr 2013 09:45:02 +0200
Subject: [PATCH] add isl_aff_add_constant_val

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 doc/user.pod      |  5 ++++-
 include/isl/aff.h |  2 ++
 isl_aff.c         | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/doc/user.pod b/doc/user.pod
index 191e4f0..a35ae3f 100644
--- a/doc/user.pod
+++ b/doc/user.pod
@@ -3688,6 +3688,8 @@ It can be modified using
 		__isl_take isl_aff *aff, isl_int v);
 	__isl_give isl_aff *isl_aff_add_constant_si(
 		__isl_take isl_aff *aff, int v);
+	__isl_give isl_aff *isl_aff_add_constant_val(
+		__isl_take isl_aff *aff, __isl_take isl_val *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_constant_num_si(
@@ -3723,7 +3725,8 @@ C<isl_aff_set_coefficient> and C<isl_aff_set_coefficient_si>
 set the I<numerator> of the constant or coefficient, while
 C<isl_aff_set_constant_val> and C<isl_aff_set_coefficient_val> set
 the constant or coefficient as a whole.
-C<add_constant> and C<add_coefficient> add an integer value to
+The C<add_constant> and C<add_coefficient> functions add an integer
+or rational value to
 the possibly rational constant or coefficient.
 The C<add_constant_num> functions add an integer value to
 the numerator.
diff --git a/include/isl/aff.h b/include/isl/aff.h
index c09d457..184ab0f 100644
--- a/include/isl/aff.h
+++ b/include/isl/aff.h
@@ -53,6 +53,8 @@ __isl_give isl_aff *isl_aff_set_coefficient_val(__isl_take isl_aff *aff,
 __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_si(__isl_take isl_aff *aff, int v);
+__isl_give isl_aff *isl_aff_add_constant_val(__isl_take isl_aff *aff,
+	__isl_take isl_val *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_constant_num_si(__isl_take isl_aff *aff, int v);
diff --git a/isl_aff.c b/isl_aff.c
index b789c73..b0a3fa0 100644
--- a/isl_aff.c
+++ b/isl_aff.c
@@ -535,6 +535,56 @@ __isl_give isl_aff *isl_aff_add_constant(__isl_take isl_aff *aff, isl_int v)
 	return aff;
 }
 
+/* Add "v" to the constant term of "aff".
+ */
+__isl_give isl_aff *isl_aff_add_constant_val(__isl_take isl_aff *aff,
+	__isl_take isl_val *v)
+{
+	if (!aff || !v)
+		goto error;
+
+	if (isl_val_is_zero(v)) {
+		isl_val_free(v);
+		return aff;
+	}
+
+	if (!isl_val_is_rat(v))
+		isl_die(isl_aff_get_ctx(aff), isl_error_invalid,
+			"expecting rational value", goto error);
+
+	aff = isl_aff_cow(aff);
+	if (!aff)
+		goto error;
+
+	aff->v = isl_vec_cow(aff->v);
+	if (!aff->v)
+		goto error;
+
+	if (isl_int_is_one(v->d)) {
+		isl_int_addmul(aff->v->el[1], aff->v->el[0], v->n);
+	} else if (isl_int_eq(aff->v->el[0], v->d)) {
+		isl_int_add(aff->v->el[1], aff->v->el[1], v->n);
+		aff->v = isl_vec_normalize(aff->v);
+		if (!aff->v)
+			goto error;
+	} else {
+		isl_seq_scale(aff->v->el + 1,
+				aff->v->el + 1, v->d, aff->v->size - 1);
+		isl_int_addmul(aff->v->el[1], aff->v->el[0], v->n);
+		isl_int_mul(aff->v->el[0], aff->v->el[0], v->d);
+		aff->v = isl_vec_normalize(aff->v);
+		if (!aff->v)
+			goto error;
+	}
+
+	isl_val_free(v);
+	return aff;
+error:
+	isl_aff_free(aff);
+	isl_val_free(v);
+	return NULL;
+}
+
 __isl_give isl_aff *isl_aff_add_constant_si(__isl_take isl_aff *aff, int v)
 {
 	isl_int t;
-- 
2.7.4