scanner: Fix rename-to handling

We were writing the attributes backwards.  Also actually use
the attribute in the typelib generation.
This commit is contained in:
Colin Walters 2010-09-03 18:07:16 -04:00
parent b18a6580d2
commit f0eeec8cd8

View File

@ -774,6 +774,7 @@ start_function (GMarkupParseContext *context,
GError **error) GError **error)
{ {
const gchar *name; const gchar *name;
const gchar *shadows;
const gchar *symbol; const gchar *symbol;
const gchar *deprecated; const gchar *deprecated;
const gchar *throws; const gchar *throws;
@ -817,6 +818,7 @@ start_function (GMarkupParseContext *context,
ctx->in_embedded_type = in_embedded_type; ctx->in_embedded_type = in_embedded_type;
name = find_attribute ("name", attribute_names, attribute_values); name = find_attribute ("name", attribute_names, attribute_values);
shadows = find_attribute ("name", attribute_names, attribute_values);
symbol = find_attribute ("c:identifier", attribute_names, attribute_values); symbol = find_attribute ("c:identifier", attribute_names, attribute_values);
deprecated = find_attribute ("deprecated", attribute_names, attribute_values); deprecated = find_attribute ("deprecated", attribute_names, attribute_values);
throws = find_attribute ("throws", attribute_names, attribute_values); throws = find_attribute ("throws", attribute_names, attribute_values);
@ -832,6 +834,9 @@ start_function (GMarkupParseContext *context,
return FALSE; return FALSE;
} }
if (shadows)
name = shadows;
function = (GIrNodeFunction *) g_ir_node_new (G_IR_NODE_FUNCTION, function = (GIrNodeFunction *) g_ir_node_new (G_IR_NODE_FUNCTION,
ctx->current_module); ctx->current_module);