mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-14 16:26:17 +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
119 lines
3.4 KiB
Meson
119 lines
3.4 KiB
Meson
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
# SPDX-FileCopyrightText: 2024 GNOME Foundation
|
|
|
|
girepository_tests = {
|
|
'cmph-bdz': {
|
|
'dependencies': [cmph_dep],
|
|
},
|
|
'gthash' : {
|
|
'dependencies': [girepo_gthash_dep],
|
|
},
|
|
}
|
|
|
|
# Some tests require GIR files to have been generated
|
|
if enable_gir
|
|
girepository_tests += {
|
|
'function-info' : {
|
|
'dependencies': [libffi_dep],
|
|
'depends': [glib_gir],
|
|
},
|
|
'object-info' : {
|
|
'depends': [gio_gir],
|
|
},
|
|
'registered-type-info' : {
|
|
'depends': [gobject_gir],
|
|
},
|
|
'repository' : {
|
|
'depends': [glib_gir, gio_gir, gobject_gir],
|
|
},
|
|
'repository-search-paths' : {
|
|
'c_args': '-DGOBJECT_INTROSPECTION_LIBDIR="@0@"'.format(glib_libdir),
|
|
'depends': [glib_gir],
|
|
},
|
|
'struct-info' : {
|
|
'depends': [gobject_gir],
|
|
},
|
|
'throws' : {
|
|
'depends': [glib_gir, gio_gir],
|
|
},
|
|
'union-info' : {
|
|
'depends': [glib_gir],
|
|
},
|
|
}
|
|
endif
|
|
|
|
test_env = environment()
|
|
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
|
|
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
|
|
|
|
test_deps = [libm, thread_dep, libgirepository_dep]
|
|
test_cargs = ['-DG_LOG_DOMAIN="GIRepository"', '-UG_DISABLE_ASSERT']
|
|
test_cpp_args = test_cargs
|
|
|
|
foreach test_name, extra_args : girepository_tests
|
|
source = extra_args.get('source', test_name + '.c')
|
|
install = installed_tests_enabled and extra_args.get('install', true)
|
|
installed_tests_env = extra_args.get('installed_tests_env', {})
|
|
|
|
if install
|
|
test_conf = configuration_data()
|
|
test_conf.set('installed_tests_dir', installed_tests_execdir)
|
|
test_conf.set('program', test_name)
|
|
test_env_override = ''
|
|
if installed_tests_env != {}
|
|
envs = []
|
|
foreach var, value : installed_tests_env
|
|
envs += '@0@=@1@'.format(var, value)
|
|
endforeach
|
|
test_env_override = '@0@ @1@ '.format(env_program.full_path(), ' '.join(envs))
|
|
endif
|
|
test_conf.set('env', test_env_override)
|
|
configure_file(
|
|
input: installed_tests_template_tap,
|
|
output: test_name + '.test',
|
|
install_dir: installed_tests_metadir,
|
|
install_tag: 'tests',
|
|
configuration: test_conf
|
|
)
|
|
endif
|
|
|
|
exe = executable(test_name, source, 'test-common.c',
|
|
c_args: test_cargs + extra_args.get('c_args', []),
|
|
cpp_args: test_cpp_args + extra_args.get('cpp_args', []),
|
|
link_args: extra_args.get('link_args', []),
|
|
override_options: extra_args.get('override_options', []),
|
|
dependencies: test_deps + extra_args.get('dependencies', []),
|
|
link_with: extra_args.get('link_with', []),
|
|
install_dir: installed_tests_execdir,
|
|
install_tag: 'tests',
|
|
install: install,
|
|
)
|
|
|
|
depends = [extra_args.get('depends', [])]
|
|
suite = ['girepository', 'core'] + extra_args.get('suite', [])
|
|
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
|
|
|
|
if extra_args.get('can_fail', false)
|
|
suite += 'failing'
|
|
endif
|
|
|
|
foreach program : extra_args.get('extra_programs', [])
|
|
depends += test_extra_programs_targets[program]
|
|
endforeach
|
|
|
|
local_test_env = test_env
|
|
foreach var, value : extra_args.get('env', {})
|
|
local_test_env.append(var, value)
|
|
endforeach
|
|
|
|
test(test_name, exe,
|
|
args: extra_args.get('args', []),
|
|
protocol: extra_args.get('protocol', test_protocol),
|
|
depends: depends,
|
|
env: local_test_env,
|
|
timeout: timeout,
|
|
suite: suite,
|
|
should_fail: extra_args.get('should_fail', false),
|
|
)
|
|
endforeach
|