luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-02 02:40:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Parse new implements syntax, drop gapi one. Update. Generate new syntax.

Browse Source 
2008-08-25  Colin Walters  <walters@verbum.org>

	* girepository/girparser.c: Parse new implements
	syntax, drop gapi one.
	* tests/object.gir: Update.
	* tools/generate.c: Generate new syntax.

svn path=/trunk/; revision=492
This commit is contained in:
Colin Walters 2008-08-25 15:22:39 +00:00 committed by Colin Walters
parent 92b476b8c1
commit 777cc726a4
1 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
girparser.c
View File

@ -1531,6 +1531,36 @@ start_return_value (GMarkupParseContext *context,
return FALSE; return FALSE;
} }
static gboolean
start_implements (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
ParseContext *ctx,
GError **error)
{
GIrNodeInterface *iface;
const char *name;
if (strcmp (element_name, "implements") != 0 ||
!(ctx->state == STATE_CLASS))
return FALSE;
state_switch (ctx, STATE_IMPLEMENTS);
name = find_attribute ("name", attribute_names, attribute_values);
if (name == NULL)
{
MISSING_ATTRIBUTE (context, error, element_name, "name");
return FALSE;
}
iface = (GIrNodeInterface *)ctx->current_node;
iface->interfaces = g_list_append (iface->interfaces, g_strdup (name));
return TRUE;
}
static gboolean static gboolean
start_glib_signal (GMarkupParseContext *context, start_glib_signal (GMarkupParseContext *context,
const gchar *element_name, const gchar *element_name,
@ -1947,51 +1977,10 @@ start_element_handler (GMarkupParseContext *context,
attribute_names, attribute_values, attribute_names, attribute_values,
ctx, error)) ctx, error))
goto out; goto out;
if (strcmp (element_name, "implements") == 0 && else if (start_implements (context, element_name,
ctx->state == STATE_CLASS) attribute_names, attribute_values,
{ ctx, error))
state_switch (ctx, STATE_IMPLEMENTS); goto out;
goto out;
}
else if (strcmp (element_name, "interface") == 0 &&
ctx->state == STATE_IMPLEMENTS)
{
const gchar *name;
name = find_attribute ("name", attribute_names, attribute_values);
if (name == NULL)
MISSING_ATTRIBUTE (context, error, element_name, "name");
else
{
GIrNodeInterface *iface;
iface = (GIrNodeInterface *)ctx->current_node;
iface ->interfaces = g_list_append (iface->interfaces, g_strdup (name));
}
goto out;
}
else if (strcmp (element_name, "interface") == 0 &&
ctx->state == STATE_REQUIRES)
{
const gchar *name;
name = find_attribute ("name", attribute_names, attribute_values);
if (name == NULL)
MISSING_ATTRIBUTE (context, error, element_name, "name");
else
{
GIrNodeInterface *iface;
iface = (GIrNodeInterface *)ctx->current_node;
iface ->prerequisites = g_list_append (iface->prerequisites, g_strdup (name));
}
goto out;
}
break; break;
case 'm': case 'm':