Add signed integers (arithmetics and some testing not implemented yet)

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 47 insertions, 19 deletions

diff --git a/libj2_j2u_is_min.c b/libj2_j2u_is_min.c
index a2a7565..7a50372 100644
--- a/libj2_j2u_is_min.c
+++ b/libj2_j2u_is_min.c
@@ -13,23 +13,23 @@ main(void)
 {
 	struct libj2_j2u value;
 	uintmax_t a, b;
-	int i, j;
+	unsigned i, j;
 
-	for (i = 0; i < CHAR_BIT * (int)sizeof(uintmax_t); i++) {
-		for (j = 0; j < CHAR_BIT * (int)sizeof(uintmax_t); j++) {
-			value.high = a = (uintmax_t)(i + 1);
-			value.low = b = (uintmax_t)(j + 1);
+	for (i = 0; i < LIBJ2_JU_BIT; i++) {
+		for (j = 0; j < LIBJ2_JU_BIT; j++) {
+			value.high = a = i + 1U;
+			value.low = b = j + 1U;
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
 			EXPECT(value.low == b);
 
 			value.high = a = (uintmax_t)1 << i;
-			value.low = b = (uintmax_t)(j + 1);
+			value.low = b = j + 1U;
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
 			EXPECT(value.low == b);
 
-			value.high = a = (uintmax_t)(i + 1);
+			value.high = a = i + 1U;
 			value.low = b = (uintmax_t)1 << j;
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
@@ -41,19 +41,19 @@ main(void)
 			EXPECT(value.high == a);
 			EXPECT(value.low == b);
 
-			value.high = a = ~((uintmax_t)(i + 1));
-			value.low = b = ~((uintmax_t)(j + 1));
+			value.high = a = ~((uintmax_t)(i + 1U));
+			value.low = b = ~((uintmax_t)(j + 1U));
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
 			EXPECT(value.low == b);
 
 			value.high = a = ~((uintmax_t)1 << i);
-			value.low = b = ~((uintmax_t)(j + 1));
+			value.low = b = ~((uintmax_t)(j + 1U));
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
 			EXPECT(value.low == b);
 
-			value.high = a = ~((uintmax_t)(i + 1));
+			value.high = a = ~((uintmax_t)(i + 1U));
 			value.low = b = ~((uintmax_t)1 << j);
 			EXPECT(!libj2_j2u_is_min(&value));
 			EXPECT(value.high == a);
@@ -67,12 +67,12 @@ main(void)
 		}
 
 		value.high = 0;
-		value.low = a = (uintmax_t)(i + 1);
+		value.low = a = i + 1U;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == 0);
 		EXPECT(value.low == a);
 
-		value.high = a = (uintmax_t)(i + 1);
+		value.high = a = i + 1U;
 		value.low = 0;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == a);
@@ -91,12 +91,12 @@ main(void)
 		EXPECT(value.low == 0);
 
 		value.high = 0;
-		value.low = a = ~((uintmax_t)(i + 1));
+		value.low = a = ~((uintmax_t)(i + 1U));
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == 0);
 		EXPECT(value.low == a);
 
-		value.high = a = ~((uintmax_t)(i + 1));
+		value.high = a = ~((uintmax_t)(i + 1U));
 		value.low = 0;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == a);
@@ -117,12 +117,12 @@ main(void)
 		b = ~(uintmax_t)0;
 
 		value.high = b;
-		value.low = a = (uintmax_t)(i + 1);
+		value.low = a = i + 1U;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == b);
 		EXPECT(value.low == a);
 
-		value.high = a = (uintmax_t)(i + 1);
+		value.high = a = i + 1U;
 		value.low = b;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == a);
@@ -141,12 +141,12 @@ main(void)
 		EXPECT(value.low == b);
 
 		value.high = b;
-		value.low = a = ~((uintmax_t)(i + 1));
+		value.low = a = ~((uintmax_t)(i + 1U));
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == b);
 		EXPECT(value.low == a);
 
-		value.high = a = ~((uintmax_t)(i + 1));
+		value.high = a = ~((uintmax_t)(i + 1U));
 		value.low = b;
 		EXPECT(!libj2_j2u_is_min(&value));
 		EXPECT(value.high == a);
@@ -191,6 +191,34 @@ main(void)
 	EXPECT(value.high == a);
 	EXPECT(value.low == a);
 
+	a >>= 1;
+
+	value.high = a;
+	value.low = 0;
+	EXPECT(!libj2_j2u_is_min(&value));
+	EXPECT(value.high == a);
+	EXPECT(value.low == 0);
+
+	value.high = a;
+	value.low = ~(uintmax_t)0;
+	EXPECT(!libj2_j2u_is_min(&value));
+	EXPECT(value.high == a);
+	EXPECT(value.low == ~(uintmax_t)0);
+
+	a = UINTMAX_MAX ^ (UINTMAX_MAX >> 1);
+
+	value.high = a;
+	value.low = 0;
+	EXPECT(!libj2_j2u_is_min(&value));
+	EXPECT(value.high == a);
+	EXPECT(value.low == 0);
+
+	value.high = a;
+	value.low = ~(uintmax_t)0;
+	EXPECT(!libj2_j2u_is_min(&value));
+	EXPECT(value.high == a);
+	EXPECT(value.low == ~(uintmax_t)0);
+
 	return 0;
 }