diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-08-16 10:02:23 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-08-16 10:02:23 +0200 |
| commit | 902af61c80e1f7ffd6d26fb3d599d7db01dcfc76 (patch) | |
| tree | 89c9692f2f7a711d78168a7cdc570e7360d2b804 | |
| parent | c0eda71211ab12d2dd96e5fcc0563ade930edd08 (diff) | |
| download | vala-wip/682_array_methods_refactor.tar.gz | |
| -rw-r--r-- | tests/basic-types/arrays-move-with-class.c-expected | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/tests/basic-types/arrays-move-with-class.c-expected b/tests/basic-types/arrays-move-with-class.c-expected index 66da9ceb9..0dd852987 100644 --- a/tests/basic-types/arrays-move-with-class.c-expected +++ b/tests/basic-types/arrays-move-with-class.c-expected @@ -63,7 +63,8 @@ static void _vala_array_free (gpointer array, GDestroyNotify destroy_func); static void _vala_array_move (gpointer array, gsize element_size, - GDestroyNotify free_func, + GDestroyNotify element_destroy_func, + gboolean is_pointer, gssize src, gssize dest, gssize length); @@ -166,7 +167,7 @@ test_array_with_class_move (void) a_length1 = 9; _a_size_ = a_length1; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 10), "foo.ref_count == 10"); - _vala_array_move (a, sizeof (Foo*), g_object_unref, 0, 2, 3); + _vala_array_move (a, sizeof (Foo*), g_object_unref, TRUE, 0, 2, 3); a = (_vala_array_free (a, a_length1, (GDestroyNotify) g_object_unref), NULL); _g_object_unref0 (foo); } @@ -197,7 +198,7 @@ test_unowned_array_with_class_move (void) a_length1 = 9; _a_size_ = a_length1; _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); - _vala_array_move (a, sizeof (Foo*), NULL, 0, 2, 3); + _vala_array_move (a, sizeof (Foo*), NULL, TRUE, 0, 2, 3); _vala_assert (G_TYPE_CHECK_INSTANCE_CAST (foo, G_TYPE_OBJECT, GObject)->ref_count == ((guint) 1), "foo.ref_count == 1"); a = (g_free (a), NULL); _g_object_unref0 (foo); @@ -245,26 +246,45 @@ _vala_array_free (gpointer array, static void _vala_array_move (gpointer array, gsize element_size, - GDestroyNotify free_func, + GDestroyNotify element_destroy_func, + gboolean is_pointer, gssize src, gssize dest, gssize length) { - if (free_func != NULL) { + if (element_destroy_func != NULL) { if ((src < dest) && ((src + length) > dest)) { gssize i; - for (i = dest; i < (src + length); i++) { - free_func (((void**) array)[i]); + if (is_pointer) { + for (i = dest; i < (src + length); i++) { + element_destroy_func (((void**) array)[i]); + } + } else { + for (i = dest; i < (src + length); i++) { + element_destroy_func (((char*) array) + (i * element_size)); + } } } else if ((src > dest) && (src < (dest + length))) { gssize i; - for (i = dest; i < src; i++) { - free_func (((void**) array)[i]); + if (is_pointer) { + for (i = dest; i < src; i++) { + element_destroy_func (((void**) array)[i]); + } + } else { + for (i = dest; i < src; i++) { + element_destroy_func (((char*) array) + (i * element_size)); + } } } else if (src != dest) { gssize i; - for (i = dest; i < (dest + length); i++) { - free_func (((void**) array)[i]); + if (is_pointer) { + for (i = dest; i < (dest + length); i++) { + element_destroy_func (((void**) array)[i]); + } + } else { + for (i = dest; i < (dest + length); i++) { + element_destroy_func (((char*) array) + (i * element_size)); + } } } } |