1.1 --- a/test/test_list.cpp Wed Nov 23 22:40:55 2022 +0100
1.2 +++ b/test/test_list.cpp Sat Nov 26 16:58:41 2022 +0100
1.3 @@ -686,11 +686,11 @@
1.4
1.5 void verifyIterator(CxList *list) const {
1.6 int i = 0;
1.7 - CxIterator iter = cxListBegin(list);
1.8 + auto iter = cxListBeginMut(list);
1.9 cx_foreach(int*, x, iter) {
1.10 ASSERT_EQ(iter.index, (size_t) (i + 1) / 2);
1.11 ASSERT_EQ(*x, testdata.data[i]);
1.12 - if (i % 2 == 1) iter.remove = true;
1.13 + if (i % 2 == 1) cxIteratorFlagRemoval(iter);
1.14 i++;
1.15 }
1.16 auto len = testdata_len;
1.17 @@ -702,31 +702,31 @@
1.18 static void verifyInsertViaIterator(CxList *list) {
1.19 int newdata[] = {10, 20, 30, 40, 50};
1.20
1.21 - CxIterator iter = cxListIterator(list, 2);
1.22 - EXPECT_TRUE(cxIteratorValid(&iter));
1.23 + auto iter = cxListMutIterator(list, 2);
1.24 + EXPECT_TRUE(cxIteratorValid(iter));
1.25 EXPECT_EQ(iter.index, 2);
1.26 - EXPECT_EQ(*(int *) cxIteratorCurrent(&iter), 2);
1.27 + EXPECT_EQ(*(int *) cxIteratorCurrent(iter), 2);
1.28 cxListInsertAfter(&iter, &newdata[0]);
1.29 - EXPECT_TRUE(cxIteratorValid(&iter));
1.30 + EXPECT_TRUE(cxIteratorValid(iter));
1.31 EXPECT_EQ(iter.index, 2);
1.32 - EXPECT_EQ(*(int *) cxIteratorCurrent(&iter), 2);
1.33 + EXPECT_EQ(*(int *) cxIteratorCurrent(iter), 2);
1.34 cxListInsertBefore(&iter, &newdata[1]);
1.35 - EXPECT_TRUE(cxIteratorValid(&iter));
1.36 + EXPECT_TRUE(cxIteratorValid(iter));
1.37 EXPECT_EQ(iter.index, 3);
1.38 - EXPECT_EQ(*(int *) cxIteratorCurrent(&iter), 2);
1.39 + EXPECT_EQ(*(int *) cxIteratorCurrent(iter), 2);
1.40
1.41 - iter = cxListBegin(list);
1.42 + iter = cxListBeginMut(list);
1.43 cxListInsertBefore(&iter, &newdata[2]);
1.44 - EXPECT_TRUE(cxIteratorValid(&iter));
1.45 + EXPECT_TRUE(cxIteratorValid(iter));
1.46 EXPECT_EQ(iter.index, 1);
1.47 - EXPECT_EQ(*(int *) cxIteratorCurrent(&iter), 0);
1.48 - iter = cxListIterator(list, list->size);
1.49 + EXPECT_EQ(*(int *) cxIteratorCurrent(iter), 0);
1.50 + iter = cxListMutIterator(list, list->size);
1.51 cxListInsertBefore(&iter, &newdata[3]);
1.52 - EXPECT_FALSE(cxIteratorValid(&iter));
1.53 + EXPECT_FALSE(cxIteratorValid(iter));
1.54 EXPECT_EQ(iter.index, 9);
1.55 - iter = cxListIterator(list, list->size);
1.56 + iter = cxListMutIterator(list, list->size);
1.57 cxListInsertAfter(&iter, &newdata[4]);
1.58 - EXPECT_FALSE(cxIteratorValid(&iter));
1.59 + EXPECT_FALSE(cxIteratorValid(iter));
1.60 EXPECT_EQ(iter.index, 10);
1.61
1.62 int expdata[] = {30, 0, 1, 20, 2, 10, 3, 4, 40, 50};
