From b27f490acb1452ec6bc2d4ce6a0240574df29399 Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Sun, 14 Jun 2020 00:18:26 +0200
Subject: [PATCH] Fix typing

---
 tests/test-mdeque.c  | 12 ++++++------
 tests/test-mdict.c   | 20 ++++++++++----------
 tests/test-mrbtree.c |  2 +-
 tests/test-obj.h     |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/test-mdeque.c b/tests/test-mdeque.c
index 952336c9..eb9c3303 100644
--- a/tests/test-mdeque.c
+++ b/tests/test-mdeque.c
@@ -127,15 +127,15 @@ static void test1(void)
 static void test_it(void)
 {
   M_LET(d, OPL) {
-    for(size_t i = 0; i < 1997; i ++) {
+    for(int i = 0; i < 1997; i ++) {
       deque_push_back(d, 1997+i);
       deque_push_front(d, 1996-i);
       deque_it_t it;
       deque_it_last (it, d);
       assert (deque_last_p(it));
-      assert (*deque_cref (it) == (int)(1997+i));
+      assert (*deque_cref (it) == (1997+i));
       deque_it(it, d);
-      assert (*deque_cref (it) == (int)(1996-i));
+      assert (*deque_cref (it) == (1996-i));
     }
     int s = 0;
     for M_EACH(it, d, OPL) {
@@ -188,7 +188,7 @@ static void test_set(void)
 {
   M_LET(e, d, OPL) {
     assert (deque_equal_p(d, e));
-    for(size_t i = 0; i < 1997; i ++)
+    for(int i = 0; i < 1997; i ++)
       deque_push_back(d, i);
     assert (!deque_equal_p(d, e));
     deque_set(e, d);
@@ -222,9 +222,9 @@ static void test_set(void)
     deque_push_back(d, 10000);
     deque_push_front(d, -10000);
     assert (deque_size (d) == 1999);
-    for(size_t i = 0; i < 1999; i ++)
+    for(int i = 0; i < 1999; i ++)
       deque_pop_back(NULL, d);
-    for(size_t i = 0; i < 3001; i ++)
+    for(int i = 0; i < 3001; i ++)
       deque_push_back(d, i);
     deque_init (e);
     deque_move (e, d);
diff --git a/tests/test-mdict.c b/tests/test-mdict.c
index e1a452a6..f9f5bfbf 100644
--- a/tests/test-mdict.c
+++ b/tests/test-mdict.c
@@ -333,28 +333,28 @@ static void test_oa(void)
   dict_oa_int_t d;
   dict_oa_int_init(d);
 
-  for(size_t i = 0 ; i < 150; i+= 3)
+  for(int i = 0 ; i < 150; i+= 3)
     dict_oa_int_set_at(d, i, i*i);
   assert(dict_oa_int_size(d) == 50);
-  for(size_t i = 0 ; i < 150; i++) {
+  for(int i = 0 ; i < 150; i++) {
     int *p = dict_oa_int_get(d, i);
     if ((i % 3) == 0) {
       assert (p != NULL);
-      assert (*p == M_ASSIGN_CAST(int, i*i));
+      assert (*p == i*i);
     } else {
       assert (p == NULL);
     }
   }
   assert(dict_oa_int_size(d) == 50);
 
-  for(size_t i = 1 ; i < 150; i+= 3)
+  for(int i = 1 ; i < 150; i+= 3)
     *dict_oa_int_get_at(d, i) = i*i;
   assert(dict_oa_int_size(d) == 100);
-  for(size_t i = 0 ; i < 150; i++) {
+  for(int i = 0 ; i < 150; i++) {
     int *p = dict_oa_int_get(d, i);
     if ((i % 3) != 2) {
       assert (p != NULL);
-      assert (*p == M_ASSIGN_CAST(int, i*i));
+      assert (*p == i*i);
     } else {
       assert (p == NULL);
     }
@@ -367,7 +367,7 @@ static void test_oa(void)
 static void test_init_oa(void)
 {
   M_LET(d1, d2, DICT_OPLIST(dict_oa_int, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)){
-    for(size_t i = 0; i < 100; i++) {
+    for(int i = 0; i < 100; i++) {
       dict_oa_int_set_at (d1, 2*i, 2*i+1);
     }
     assert (dict_oa_int_size (d1) == 100);
@@ -397,7 +397,7 @@ static void test_init_oa(void)
     assert (b);
     assert (!dict_oa_int_equal_p (d2, d1));
 
-    for(size_t i = 1; i < 100; i++) {
+    for(int i = 1; i < 100; i++) {
       b = dict_oa_int_erase (d1, 2*i);
       assert (b);
     }
@@ -410,7 +410,7 @@ static void test_init_oa(void)
 
     dict_oa_int_init_move (d3, d1);
     assert (dict_oa_int_size (d3) == 100);
-    for(size_t i = 0; i < 100; i++) {
+    for(int i = 0; i < 100; i++) {
       assert (*dict_oa_int_get (d3, 2*i) == 2*(int)i+1);
     }
     dict_oa_int_init_set (d1, d3);
@@ -427,7 +427,7 @@ static void test_init_oa(void)
 static void test_it_oa(void)
 {
   M_LET(d1, DICT_OPLIST(dict_oa_int, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)){
-    for(size_t i = 0; i < 100; i++) {
+    for(int i = 0; i < 100; i++) {
       dict_oa_int_set_at (d1, 2*i, 2*i+1);
     }
     assert (dict_oa_int_size (d1) == 100);
diff --git a/tests/test-mrbtree.c b/tests/test-mrbtree.c
index ac967b62..3ef28d4a 100644
--- a/tests/test-mrbtree.c
+++ b/tests/test-mrbtree.c
@@ -34,7 +34,7 @@ static bool uint_in_str(unsigned int *u, FILE *f)
 static bool uint_parse_str(unsigned int *u, const char str[], const char **endptr)
 {
   char *end;
-  *u = strtol(str, &end, 0);
+  *u = (unsigned int) strtol(str, &end, 0);
   if (endptr) { *endptr = (const char*) end; }
   return (uintptr_t) end != (uintptr_t) str;
 }
diff --git a/tests/test-obj.h b/tests/test-obj.h
index ef4c41b3..0a2e2b3a 100644
--- a/tests/test-obj.h
+++ b/tests/test-obj.h
@@ -110,7 +110,7 @@ static bool testobj_parse_str(testobj_t z, const char str[], const char **endptr
 {
   z->n = 1;
   char *end;
-  z->ptr[0] = strtol(str, &end, 0);
+  z->ptr[0] = (unsigned int) strtol(str, &end, 0);
   if (endptr) { *endptr = (const char*) end; }
   return (uintptr_t) end != (uintptr_t) str;
 }