luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 23:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GIrNode: fix lookup of cached type nodes

Browse Source 
Different types of array have different type nodes, so they should
produce different keys in the cache of already seen type nodes, to
avoid turning a GByteArray into a reference to a GPtrArray.

https://bugzilla.gnome.org/show_bug.cgi?id=642300
This commit is contained in:
Giovanni Campagna 2011-02-18 18:14:25 +01:00 committed by Colin Walters
parent f478da144f
commit a0890f3d8f
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
girnode.c
View File

@ -1227,19 +1227,42 @@ serialize_type (GIrTypelibBuild *build,
} }
else if (node->tag == GI_TYPE_TAG_ARRAY) else if (node->tag == GI_TYPE_TAG_ARRAY)
{ {
serialize_type (build, node->parameter_type1, str); if (node->array_type == GI_ARRAY_TYPE_C)
g_string_append (str, "["); {
serialize_type (build, node->parameter_type1, str);
g_string_append (str, "[");
if (node->has_length) if (node->has_length)
g_string_append_printf (str, "length=%d", node->length); g_string_append_printf (str, "length=%d", node->length);
else if (node->has_size) else if (node->has_size)
g_string_append_printf (str, "fixed-size=%d", node->size); g_string_append_printf (str, "fixed-size=%d", node->size);
if (node->zero_terminated) if (node->zero_terminated)
g_string_append_printf (str, "%szero-terminated=1", g_string_append_printf (str, "%szero-terminated=1",
node->has_length ? "," : ""); node->has_length ? "," : "");
g_string_append (str, "]"); g_string_append (str, "]");
}
else if (node->array_type == GI_ARRAY_TYPE_BYTE_ARRAY)
{
/* We on purpose skip serializing parameter_type1, which should
always be void*
*/
g_string_append (str, "GByteArray");
}
else
{
if (node->array_type == GI_ARRAY_TYPE_ARRAY)
g_string_append (str, "GArray");
else
g_string_append (str, "GPtrArray");
if (node->parameter_type1)
{
g_string_append (str, "<");
serialize_type (build, node->parameter_type1, str);
g_string_append (str, ">");
}
}
} }
else if (node->tag == GI_TYPE_TAG_INTERFACE) else if (node->tag == GI_TYPE_TAG_INTERFACE)
{ {
@ -1284,7 +1307,7 @@ serialize_type (GIrTypelibBuild *build,
} }
else if (node->tag == GI_TYPE_TAG_GHASH) else if (node->tag == GI_TYPE_TAG_GHASH)
{ {
g_string_append (str, "GHashTable<"); g_string_append (str, "GHashTable");
if (node->parameter_type1) if (node->parameter_type1)
{ {
g_string_append (str, "<"); g_string_append (str, "<");