test: update tests

ds-test/arrays.c

@@ -9,11 +9,12 @@ int main(void)
 	b_array_append(array, B_RV_INT(64));
 	b_array_append(array, B_RV_INT(128));
 
-	b_array_iterator it;
-	b_array_foreach(&it, array)
+	b_iterator *it = b_iterator_begin(array);
+	b_foreach_ptr(b_object, obj, it)
 	{
-		printf("object %p\n", it.value);
+		printf("object %p\n", obj);
 	}
+	b_iterator_unref(it);
 
 	b_array_unref(array);
 	return 0;

ds-test/trees.c

@@ -1,4 +1,5 @@
 #include <blue/core/btree.h>
+#include <blue/core/iterator.h>
 #include <blue/ds/dict.h>
 #include <blue/ds/number.h>
 #include <blue/ds/tree.h>
@@ -21,21 +22,23 @@ B_BTREE_DEFINE_SIMPLE_INSERT(struct btree_item, node, value, put_node)
 
 int main(void)
 {
-	b_dict_item items[]
-		= {B_DICT_ITEM("hello", B_RV_INT(32)),
-	           B_DICT_ITEM("world", B_RV_INT(64)),
-	           B_DICT_ITEM("more", B_RV_INT(128)),
-	           B_DICT_ITEM("other", B_RV_INT(256)), B_DICT_ITEM_END};
+	b_dict *dict = b_dict_create();
+	b_dict_put(dict, "hello", B_RV_INT(32));
+	b_dict_put(dict, "world", B_RV_INT(64));
+	b_dict_put(dict, "more", B_RV_INT(128));
+	b_dict_put(dict, "other", B_RV_INT(256));
 
-	b_dict *dict = b_dict_create_with_items(items);
+	b_iterator *it = b_iterator_begin(dict);
 
-	b_dict_iterator it;
-	b_dict_foreach(&it, dict)
+	size_t i = 0;
+	b_foreach(b_dict_item *, item, it)
 	{
-		printf("item %zu: %s=%d\n", it.i, b_string_ptr(it.key),
-		       b_number_get_int(it.value));
+		printf("item %zu: %s=%d\n", i++, b_string_ptr(item->key),
+		       b_number_get_int(item->value));
 	}
 
+	b_iterator_unref(it);
+
 	b_tree *tree = b_tree_create();
 	struct tree_item items2[NITEMS];
 
@@ -54,6 +57,8 @@ int main(void)
 	b_tree_node_add_child(&items2[1].node, &items2[5].node);
 	b_tree_node_add_child(&items2[4].node, &items2[6].node);
 
+#if 0
+	it = b_iterator_begin(tree);
 	b_tree_iterator it2;
 	b_tree_foreach(&it2, tree)
 	{
@@ -113,6 +118,7 @@ int main(void)
 	}
 
 	b_tree_unref(tree);
+#endif
 	b_dict_unref(dict);
 
 	return 0;

ds-test/unicode-strings.c

@@ -12,15 +12,15 @@ int main(void)
 	printf("len: %zu\n", b_string_get_size(str, B_STRLEN_NORMAL));
 	printf("codepoints: %zu\n", b_string_get_size(str, B_STRLEN_CODEPOINTS));
 
-	b_string_iterator it;
 	const char *delims[] = {"в"};
 	size_t nr_delims = sizeof delims / sizeof delims[0];
 
-	b_string_tokenise(str, delims, nr_delims, 0, &it);
-	while (b_string_iterator_is_valid(&it)) {
-		printf("%s\n", it.string_value);
-		b_string_iterator_next(&it);
+	b_iterator *it = b_string_tokenise(str, delims, nr_delims, 0);
+	b_foreach(const char *, tok, it)
+	{
+		printf("%s\n", tok);
 	}
+	b_iterator_unref(it);
 
 	return 0;
 }