mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-14 05:16:18 +01:00
0fd99a9f16
Instead, add a method on `GIRegisteredTypeInfo` which indicates whether the registered type is a boxed type. This will return true for `GIStructInfo` and `GIUnionInfo` instances which are boxed (not all structs and unions are). This makes `GIBoxedInfo` redundant, and it’ll be dropped in a following commit. --- There are several different things which typelibs need to be able to represent: 1. Plain old datatype (POD) structs 2. POD unions 3. Structs with a copy func and/or free func 4. Unions with a copy func and/or free func 5. Structs which are the ‘GType struct’ for an object or interface (i.e. the class or instance or interface struct) 6. Structs with a copy func and free func *and* boxed GType 7. Unions with a copy func and free func *and* boxed GType 8. Boxed GTypes which represent something other than a struct or union So there’s a lot going on here. In commit e28078c70cbf4a57c7dbd39626f43f9bd2674145, a lot of this was reworked, and support was added for boxed unions and boxed ‘others’ (the last item on the list above). Since then, support for boxed types other than structs seems to have atrophied a bit, and the whole lot has got a bit confusing. It was perhaps less confusing when all the `GIBaseInfo` subclasses were actually aliases of each other, but now they have subtype relationships, the position of `GIBoxedInfo` in that type hierarchy has become unclear. How is it related to `GIStructInfo`, `GIUnionInfo` and `GIRegisteredTypeInfo`? Since a boxed type is necessarily a `GIRegisteredTypeInfo`, and the methods of `GIRegisteredTypeInfo` are all written to allow a `GType` to be optional, so that `GIStructInfo` and `GIUnionInfo` can safely derive from it and still be used to represent plain old datatypes without `GType`s, it makes sense to add a method to `GIRegisteredTypeInfo` to indicate that the registered type is derived from `G_TYPE_BOXED`. Accordingly, the things above are now represented in libgirepository’s type system as: 1. `GIStructInfo` instance, `GIRegisteredTypeInfo` methods return no `GType` info 2. `GIUnionInfo` instance similarly 3. `GIStructInfo` instance, `GIRegisteredTypeInfo` methods return no `GType` info, `gi_struct_info_get_{copy,free}_function_name()` return non-`NULL` values 4. `GIUnionInfo` instance similarly 5. `GIStructInfo` instance, `GIRegisteredTypeInfo` methods return no `GType` info, `gi_struct_info_is_gtype_struct()` returns true 6. `GIStructInfo` instance, `GIRegisteredTypeInfo` methods return valid `GType` information, `gi_registered_type_info_is_boxed()` returns true, `gi_struct_info_get_{copy,free}_function_name()` return `NULL` values (because the copy/free functions are hidden inside the boxed type registration at runtime) 7. `GIUnionInfo` instance similarly 8. Not representable, but could be represented in future by re-adding a `GIBoxedInfo` type which derives from `GIRegisteredTypeInfo` and is used solely for boxed ‘other’ types, *not* boxed structs or unions Signed-off-by: Philip Withnall <pwithnall@gnome.org> Fixes: #3245
137 lines
4.6 KiB
C
137 lines
4.6 KiB
C
/*
|
|
* Copyright 2014 Simon Feltman <sfeltman@gnome.org>
|
|
*
|
|
* SPDX-License-Identifier: LGPL-2.1-or-later
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General
|
|
* Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "girepository.h"
|
|
#include "test-common.h"
|
|
|
|
static void
|
|
test_field_iterators (RepositoryFixture *fx,
|
|
const void *unused)
|
|
{
|
|
GIStructInfo *class_info = NULL;
|
|
GIFieldInfo *field_info = NULL;
|
|
unsigned ix;
|
|
|
|
g_test_summary ("Test iterating through a struct's fields with gi_struct_info_get_field()");
|
|
|
|
class_info = GI_STRUCT_INFO (gi_repository_find_by_name (fx->repository, "GObject", "ObjectClass"));
|
|
g_assert_nonnull (class_info);
|
|
|
|
for (ix = 0; ix < gi_struct_info_get_n_fields (class_info); ix++)
|
|
{
|
|
const char *field_name = NULL;
|
|
GIFieldInfo *found = NULL;
|
|
|
|
field_info = gi_struct_info_get_field (class_info, ix);
|
|
g_assert_nonnull (field_info);
|
|
|
|
field_name = gi_base_info_get_name (GI_BASE_INFO (field_info));
|
|
g_assert_nonnull (field_name);
|
|
|
|
found = gi_struct_info_find_field (class_info, field_name);
|
|
g_assert_nonnull (found);
|
|
g_assert_cmpstr (gi_base_info_get_name (GI_BASE_INFO (found)), ==, field_name);
|
|
|
|
g_clear_pointer (&found, gi_base_info_unref);
|
|
g_clear_pointer (&field_info, gi_base_info_unref);
|
|
}
|
|
|
|
field_info = gi_struct_info_find_field (class_info, "not_a_real_field_name");
|
|
g_assert_null (field_info);
|
|
|
|
g_clear_pointer (&class_info, gi_base_info_unref);
|
|
}
|
|
|
|
static void
|
|
test_size_of_gvalue (RepositoryFixture *fx,
|
|
const void *unused)
|
|
{
|
|
GIStructInfo *struct_info;
|
|
|
|
g_test_summary ("Test that gi_struct_info_get_size() reports the correct sizeof GValue");
|
|
|
|
struct_info = GI_STRUCT_INFO (gi_repository_find_by_name (fx->repository, "GObject", "Value"));
|
|
g_assert_nonnull (struct_info);
|
|
|
|
g_assert_cmpuint (gi_struct_info_get_size (struct_info), ==, sizeof (GValue));
|
|
|
|
g_clear_pointer (&struct_info, gi_base_info_unref);
|
|
}
|
|
|
|
static void
|
|
test_is_pointer_for_struct_method_arg (RepositoryFixture *fx,
|
|
const void *unused)
|
|
{
|
|
GIStructInfo *variant_info = NULL;
|
|
GIFunctionInfo *equal_info = NULL;
|
|
GIArgInfo *arg_info = NULL;
|
|
GITypeInfo *type_info = NULL;
|
|
|
|
g_test_summary ("Test that a struct method reports the correct type with gi_type_info_is_pointer()");
|
|
|
|
variant_info = GI_STRUCT_INFO (gi_repository_find_by_name (fx->repository, "GLib", "Variant"));
|
|
g_assert_nonnull (variant_info);
|
|
|
|
equal_info = gi_struct_info_find_method (variant_info, "equal");
|
|
g_assert_nonnull (equal_info);
|
|
|
|
arg_info = gi_callable_info_get_arg (GI_CALLABLE_INFO (equal_info), 0);
|
|
g_assert_nonnull (arg_info);
|
|
|
|
type_info = gi_arg_info_get_type_info (arg_info);
|
|
g_assert_nonnull (type_info);
|
|
g_assert_true (gi_type_info_is_pointer (type_info));
|
|
|
|
g_clear_pointer (&type_info, gi_base_info_unref);
|
|
g_clear_pointer (&arg_info, gi_base_info_unref);
|
|
g_clear_pointer (&equal_info, gi_base_info_unref);
|
|
g_clear_pointer (&variant_info, gi_base_info_unref);
|
|
}
|
|
|
|
static void
|
|
test_boxed (RepositoryFixture *fx,
|
|
const void *unused)
|
|
{
|
|
GIStructInfo *struct_info = NULL;
|
|
|
|
g_test_summary ("Test that a boxed struct is recognised as such");
|
|
|
|
struct_info = GI_STRUCT_INFO (gi_repository_find_by_name (fx->repository, "GObject", "BookmarkFile"));
|
|
g_assert_nonnull (struct_info);
|
|
g_assert_true (gi_registered_type_info_is_boxed (GI_REGISTERED_TYPE_INFO (struct_info)));
|
|
|
|
g_clear_pointer (&struct_info, gi_base_info_unref);
|
|
}
|
|
|
|
int
|
|
main (int argc,
|
|
char *argv[])
|
|
{
|
|
repository_init (&argc, &argv);
|
|
|
|
ADD_REPOSITORY_TEST ("/struct-info/field-iterators", test_field_iterators, &typelib_load_spec_gobject);
|
|
ADD_REPOSITORY_TEST ("/struct-info/sizeof-gvalue", test_size_of_gvalue, &typelib_load_spec_gobject);
|
|
ADD_REPOSITORY_TEST ("/struct-info/is-pointer-for-struct-method-arg", test_is_pointer_for_struct_method_arg, &typelib_load_spec_glib);
|
|
ADD_REPOSITORY_TEST ("/struct-info/boxed", test_boxed, &typelib_load_spec_gobject);
|
|
|
|
return g_test_run ();
|
|
}
|