luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-24 09:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 551738 - Associate classes with their structs

Browse Source 
Inside glibtransformer, we now look at structures ending in "Class" and
see if they have an associated GlibObject (i.e. a structure of the same
name without the "Class" suffix).  If found, pair them up.

The .gir file for <class> gains an attribute denoting its associated
class struct.  Any <record> many now have a glib:is-class-struct-for
annotation which tells which (if any) <class> for which it defines the
layout.

In the .typelib, we record the association between the class and
its structure.  Generic structures however just have a boolean
saying whether they're a class struct.  (Going from a generic class
struct to its class should not be necessary).

Finally, we expose GIRepository APIs to access both bits of information
from the .typelib.

svn path=/trunk/; revision=1088
This commit is contained in:
Colin Walters
2009-02-06 18:37:13 +00:00
parent 1b22fa426f
commit ff6b28c17b
8 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gtypelib.c
View File

@@ -181,7 +181,7 @@ g_typelib_check_sanity (void)
CHECK_SIZE (PropertyBlob, 12);
CHECK_SIZE (SignalBlob, 12);
CHECK_SIZE (VFuncBlob, 16);
CHECK_SIZE (ObjectBlob, 32);
CHECK_SIZE (ObjectBlob, 36);
CHECK_SIZE (InterfaceBlob, 28);
CHECK_SIZE (ConstantBlob, 20);
CHECK_SIZE (AnnotationBlob, 12);
@@ -313,6 +313,15 @@ validate_header (ValidateContext *ctx,
"Typelib size mismatch");
return FALSE;
}
/* This is a sanity check for a specific typelib; it
* prevents us from loading an incompatible typelib. It's OK to change
* these hardcoded constants to sizeof() as you see fit.
*
* We want to keep the hardcoded checks in g_typelib_check_sanity to
* protect against inadvertent or buggy changes to the typelib format
* itself.
*/
if (header->entry_blob_size != 12 ||
header->function_blob_size != 20 ||
@@ -329,7 +338,7 @@ validate_header (ValidateContext *ctx,
header->signature_blob_size != 8 ||
header->enum_blob_size != 20 ||
header->struct_blob_size != 24 ||
header->object_blob_size != 32 ||
header->object_blob_size != sizeof(ObjectBlob) ||
header->interface_blob_size != 28 ||
header->union_blob_size != 32)
{
@@ -1435,7 +1444,9 @@ validate_object_blob (ValidateContext *ctx,
{
DirEntry *entry;
entry = g_typelib_get_dir_entry (typelib, blob->parent);
entry = get_dir_entry_checked (typelib, blob->parent, error);
if (!entry)
return FALSE;
if (entry->blob_type != BLOB_TYPE_OBJECT &&
(entry->local || entry->blob_type != 0))
{
@@ -1447,6 +1458,23 @@ validate_object_blob (ValidateContext *ctx,
}
}
if (blob->class_struct != 0)
{
DirEntry *entry;
entry = get_dir_entry_checked (typelib, blob->class_struct, error);
if (!entry)
return FALSE;
if (entry->blob_type != BLOB_TYPE_STRUCT && entry->local)
{
g_set_error (error,
G_TYPELIB_ERROR,
G_TYPELIB_ERROR_INVALID_BLOB,
"Class struct invalid type or not local");
return FALSE;
}
}
if (typelib->len < offset + sizeof (ObjectBlob) +
(blob->n_interfaces + blob->n_interfaces % 2) * 2 +
blob->n_fields * sizeof (FieldBlob) +
@@ -1481,7 +1509,9 @@ validate_object_blob (ValidateContext *ctx,
return FALSE;
}
entry = g_typelib_get_dir_entry (typelib, iface);
entry = get_dir_entry_checked (typelib, iface, error);
if (!entry)
return FALSE;
if (entry->blob_type != BLOB_TYPE_INTERFACE &&
(entry->local || entry->blob_type != 0))