mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 09:16:15 +02:00
Add union.test.
2005-05-15 Matthias Clasen <mclasen@redhat.com>
* tests/roundtrips.sh (SIMPLE_TESTS): Add union.test.
* tests/union.test: Add a union test.
* src/generate.c: Handle unions.
* src/girepository.h:
* src/ginfo.c: Add GIUnionInfo and functions to access it.
* src/gidlnode.c: Handle GIdlNodeUnion nodes.
* src/gidlparser.c (start_union): Parse <union> elements.
* src/gidlnode.h: Add a GIdlNodeUnion.
* gidl.dtd: Add a <union> element.
* src/gmetadata.c (g_metadata_check_sanity): Check
union_blob_size.
* src/gmetadata.h: Add union_blob_size to Header,
add a UnionBlob.
* metadata-format.txt: Add a UnionBlob.
This commit is contained in:
Matthias Clasen
Philip Withnall
parent
264b3adc76
commit
45cf94a492
@ -146,9 +146,16 @@ write_type_info (const gchar *namespace,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
write_constant_value (const gchar *namespace,
|
||||||
|
GITypeInfo *info,
|
||||||
|
GArgument *argument,
|
||||||
|
FILE *file);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
write_field_info (const gchar *namespace,
|
write_field_info (const gchar *namespace,
|
||||||
GIFieldInfo *info,
|
GIFieldInfo *info,
|
||||||
|
GIConstantInfo *branch,
|
||||||
FILE *file)
|
FILE *file)
|
||||||
{
|
{
|
||||||
const gchar *name;
|
const gchar *name;
|
||||||
@ -156,6 +163,7 @@ write_field_info (const gchar *namespace,
|
|||||||
gint size;
|
gint size;
|
||||||
gint offset;
|
gint offset;
|
||||||
GITypeInfo *type;
|
GITypeInfo *type;
|
||||||
|
GArgument value;
|
||||||
|
|
||||||
name = g_base_info_get_name ((GIBaseInfo *)info);
|
name = g_base_info_get_name ((GIBaseInfo *)info);
|
||||||
flags = g_field_info_get_flags (info);
|
flags = g_field_info_get_flags (info);
|
||||||
@ -177,7 +185,18 @@ write_field_info (const gchar *namespace,
|
|||||||
write_type_info (namespace, type, file);
|
write_type_info (namespace, type, file);
|
||||||
g_base_info_unref ((GIBaseInfo *)type);
|
g_base_info_unref ((GIBaseInfo *)type);
|
||||||
|
|
||||||
g_fprintf (file, "\" />\n");
|
g_fprintf (file, "\"");
|
||||||
|
|
||||||
|
if (branch)
|
||||||
|
{
|
||||||
|
g_fprintf (file, " branch=\"");
|
||||||
|
type = g_constant_info_get_type (branch);
|
||||||
|
g_constant_info_get_value (branch, &value);
|
||||||
|
write_constant_value (namespace, type, &value, file);
|
||||||
|
g_fprintf (file, "\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
g_fprintf (file," />\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -383,7 +402,7 @@ write_struct_info (const gchar *namespace,
|
|||||||
for (i = 0; i < g_struct_info_get_n_fields (info); i++)
|
for (i = 0; i < g_struct_info_get_n_fields (info); i++)
|
||||||
{
|
{
|
||||||
GIFieldInfo *field = g_struct_info_get_field (info, i);
|
GIFieldInfo *field = g_struct_info_get_field (info, i);
|
||||||
write_field_info (namespace, field, file);
|
write_field_info (namespace, field, NULL, file);
|
||||||
g_base_info_unref ((GIBaseInfo *)field);
|
g_base_info_unref ((GIBaseInfo *)field);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -422,6 +441,65 @@ write_value_info (const gchar *namespace,
|
|||||||
g_fprintf (file, " />\n");
|
g_fprintf (file, " />\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
write_constant_value (const gchar *namespace,
|
||||||
|
GITypeInfo *type,
|
||||||
|
GArgument *value,
|
||||||
|
FILE *file)
|
||||||
|
{
|
||||||
|
switch (g_type_info_get_tag (type))
|
||||||
|
{
|
||||||
|
case GI_TYPE_TAG_BOOLEAN:
|
||||||
|
g_fprintf (file, "%d", value->v_boolean);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_INT8:
|
||||||
|
g_fprintf (file, "%d", value->v_int8);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_UINT8:
|
||||||
|
g_fprintf (file, "%d", value->v_uint8);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_INT16:
|
||||||
|
g_fprintf (file, "%" G_GINT16_FORMAT, value->v_int16);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_UINT16:
|
||||||
|
g_fprintf (file, "%" G_GUINT16_FORMAT, value->v_uint16);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_INT32:
|
||||||
|
g_fprintf (file, "%" G_GINT32_FORMAT, value->v_int32);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_UINT32:
|
||||||
|
g_fprintf (file, "%" G_GUINT32_FORMAT, value->v_uint32);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_INT64:
|
||||||
|
g_fprintf (file, "%" G_GINT64_FORMAT, value->v_int64);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_UINT64:
|
||||||
|
g_fprintf (file, "%" G_GUINT64_FORMAT, value->v_uint64);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_FLOAT:
|
||||||
|
g_fprintf (file, "%f", value->v_float);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_DOUBLE:
|
||||||
|
g_fprintf (file, "%Lf", value->v_double);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_STRING:
|
||||||
|
g_fprintf (file, "%s", value->v_string);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_INT:
|
||||||
|
g_fprintf (file, "%d", value->v_int);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_UINT:
|
||||||
|
g_fprintf (file, "%d", value->v_uint);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_LONG:
|
||||||
|
g_fprintf (file, "%ld", value->v_long);
|
||||||
|
break;
|
||||||
|
case GI_TYPE_TAG_ULONG:
|
||||||
|
g_fprintf (file, "%ld", value->v_ulong);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
write_constant_info (const gchar *namespace,
|
write_constant_info (const gchar *namespace,
|
||||||
GIConstantInfo *info,
|
GIConstantInfo *info,
|
||||||
@ -443,57 +521,7 @@ write_constant_info (const gchar *namespace,
|
|||||||
g_fprintf (file, "\" value=\"");
|
g_fprintf (file, "\" value=\"");
|
||||||
|
|
||||||
g_constant_info_get_value (info, &value);
|
g_constant_info_get_value (info, &value);
|
||||||
switch (g_type_info_get_tag (type))
|
write_constant_value (namespace, type, &value, file);
|
||||||
{
|
|
||||||
case GI_TYPE_TAG_BOOLEAN:
|
|
||||||
g_fprintf (file, "%d", value.v_boolean);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_INT8:
|
|
||||||
g_fprintf (file, "%d", value.v_int8);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_UINT8:
|
|
||||||
g_fprintf (file, "%d", value.v_uint8);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_INT16:
|
|
||||||
g_fprintf (file, "%" G_GINT16_FORMAT, value.v_int16);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_UINT16:
|
|
||||||
g_fprintf (file, "%" G_GUINT16_FORMAT, value.v_uint16);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_INT32:
|
|
||||||
g_fprintf (file, "%" G_GINT32_FORMAT, value.v_int32);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_UINT32:
|
|
||||||
g_fprintf (file, "%" G_GUINT32_FORMAT, value.v_uint32);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_INT64:
|
|
||||||
g_fprintf (file, "%" G_GINT64_FORMAT, value.v_int64);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_UINT64:
|
|
||||||
g_fprintf (file, "%" G_GUINT64_FORMAT, value.v_uint64);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_FLOAT:
|
|
||||||
g_fprintf (file, "%f", value.v_float);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_DOUBLE:
|
|
||||||
g_fprintf (file, "%Lf", value.v_double);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_STRING:
|
|
||||||
g_fprintf (file, "%s", value.v_string);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_INT:
|
|
||||||
g_fprintf (file, "%d", value.v_int);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_UINT:
|
|
||||||
g_fprintf (file, "%d", value.v_uint);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_LONG:
|
|
||||||
g_fprintf (file, "%ld", value.v_long);
|
|
||||||
break;
|
|
||||||
case GI_TYPE_TAG_ULONG:
|
|
||||||
g_fprintf (file, "%ld", value.v_ulong);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
g_fprintf (file, "\" />\n");
|
g_fprintf (file, "\" />\n");
|
||||||
|
|
||||||
g_base_info_unref ((GIBaseInfo *)type);
|
g_base_info_unref ((GIBaseInfo *)type);
|
||||||
@ -714,7 +742,7 @@ write_object_info (const gchar *namespace,
|
|||||||
for (i = 0; i < g_object_info_get_n_fields (info); i++)
|
for (i = 0; i < g_object_info_get_n_fields (info); i++)
|
||||||
{
|
{
|
||||||
GIFieldInfo *field = g_object_info_get_field (info, i);
|
GIFieldInfo *field = g_object_info_get_field (info, i);
|
||||||
write_field_info (namespace, field, file);
|
write_field_info (namespace, field, NULL, file);
|
||||||
g_base_info_unref ((GIBaseInfo *)field);
|
g_base_info_unref ((GIBaseInfo *)field);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -855,6 +883,67 @@ write_error_domain_info (const gchar *namespace,
|
|||||||
g_base_info_unref (enum_);
|
g_base_info_unref (enum_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
write_union_info (const gchar *namespace,
|
||||||
|
GIUnionInfo *info,
|
||||||
|
FILE *file)
|
||||||
|
{
|
||||||
|
const gchar *name;
|
||||||
|
const gchar *type_name;
|
||||||
|
const gchar *type_init;
|
||||||
|
gboolean deprecated;
|
||||||
|
gint i;
|
||||||
|
|
||||||
|
name = g_base_info_get_name ((GIBaseInfo *)info);
|
||||||
|
deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info);
|
||||||
|
|
||||||
|
type_name = g_registered_type_info_get_type_name ((GIRegisteredTypeInfo*)info);
|
||||||
|
type_init = g_registered_type_info_get_type_init ((GIRegisteredTypeInfo*)info);
|
||||||
|
|
||||||
|
g_fprintf (file, " <union name=\"%s\"", name);
|
||||||
|
|
||||||
|
if (type_name)
|
||||||
|
g_fprintf (file, " type-name=\"%s\" get-type=\"%s\"", type_name, type_init);
|
||||||
|
|
||||||
|
if (deprecated)
|
||||||
|
g_fprintf (file, " deprecated=\"1\"");
|
||||||
|
|
||||||
|
g_fprintf (file, ">\n");
|
||||||
|
|
||||||
|
if (g_union_info_is_discriminated (info))
|
||||||
|
{
|
||||||
|
gint offset;
|
||||||
|
GITypeInfo *type;
|
||||||
|
|
||||||
|
offset = g_union_info_get_discriminator_offset (info);
|
||||||
|
type = g_union_info_get_discriminator_type (info);
|
||||||
|
|
||||||
|
g_fprintf (file, " <discriminator offset=\"%d\" type=\"", offset);
|
||||||
|
write_type_info (namespace, type, file);
|
||||||
|
g_fprintf (file, "\" />\n");
|
||||||
|
g_base_info_unref ((GIBaseInfo *)type);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < g_union_info_get_n_fields (info); i++)
|
||||||
|
{
|
||||||
|
GIFieldInfo *field = g_union_info_get_field (info, i);
|
||||||
|
GIConstantInfo *constant = g_union_info_get_discriminator (info, i);
|
||||||
|
write_field_info (namespace, field, constant, file);
|
||||||
|
g_base_info_unref ((GIBaseInfo *)field);
|
||||||
|
if (constant)
|
||||||
|
g_base_info_unref ((GIBaseInfo *)constant);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < g_union_info_get_n_methods (info); i++)
|
||||||
|
{
|
||||||
|
GIFunctionInfo *function = g_union_info_get_method (info, i);
|
||||||
|
write_function_info (namespace, function, file, 6);
|
||||||
|
g_base_info_unref ((GIBaseInfo *)function);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_fprintf (file, " </union>\n");
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
write_repository (GIRepository *repository,
|
write_repository (GIRepository *repository,
|
||||||
gboolean needs_prefix)
|
gboolean needs_prefix)
|
||||||
@ -916,6 +1005,10 @@ write_repository (GIRepository *repository,
|
|||||||
write_struct_info (ns, (GIStructInfo *)info, file);
|
write_struct_info (ns, (GIStructInfo *)info, file);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case GI_INFO_TYPE_UNION:
|
||||||
|
write_union_info (ns, (GIUnionInfo *)info, file);
|
||||||
|
break;
|
||||||
|
|
||||||
case GI_INFO_TYPE_ENUM:
|
case GI_INFO_TYPE_ENUM:
|
||||||
case GI_INFO_TYPE_FLAGS:
|
case GI_INFO_TYPE_FLAGS:
|
||||||
write_enum_info (ns, (GIEnumInfo *)info, file);
|
write_enum_info (ns, (GIEnumInfo *)info, file);
|
||||||
@ -936,6 +1029,9 @@ write_repository (GIRepository *repository,
|
|||||||
case GI_INFO_TYPE_ERROR_DOMAIN:
|
case GI_INFO_TYPE_ERROR_DOMAIN:
|
||||||
write_error_domain_info (ns, (GIErrorDomainInfo *)info, file);
|
write_error_domain_info (ns, (GIErrorDomainInfo *)info, file);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
g_error ("unknown info type %d\n", g_base_info_get_type (info));
|
||||||
}
|
}
|
||||||
|
|
||||||
g_base_info_unref (info);
|
g_base_info_unref (info);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user