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

Union field parsing

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

	* girepository/girparser.c: Parse union fields.

svn path=/trunk/; revision=416
This commit is contained in:
Colin Walters 2008-08-20 15:05:46 +00:00 committed by Colin Walters
parent b3312fb83f
commit abcebee79f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
girparser.c
View File

@ -53,8 +53,9 @@ typedef enum
STATE_STRUCT_FIELD, STATE_STRUCT_FIELD,
STATE_ERRORDOMAIN, STATE_ERRORDOMAIN,
STATE_UNION, STATE_UNION,
STATE_NAMESPACE_CONSTANT, STATE_UNION_FIELD,
STATE_CLASS_CONSTANT, /* 25 */ STATE_NAMESPACE_CONSTANT, /* 25 */
STATE_CLASS_CONSTANT,
STATE_INTERFACE_CONSTANT, STATE_INTERFACE_CONSTANT,
STATE_ALIAS STATE_ALIAS
} ParseState; } ParseState;
@ -882,6 +883,7 @@ start_field (GMarkupParseContext *context,
union_->discriminators = g_list_append (union_->discriminators, constant); union_->discriminators = g_list_append (union_->discriminators, constant);
} }
state_switch (ctx, STATE_UNION_FIELD);
} }
break; break;
default: default:
@ -1364,6 +1366,7 @@ start_type (GMarkupParseContext *context,
!(ctx->state == STATE_FUNCTION_PARAMETER || !(ctx->state == STATE_FUNCTION_PARAMETER ||
ctx->state == STATE_FUNCTION_RETURN || ctx->state == STATE_FUNCTION_RETURN ||
ctx->state == STATE_STRUCT_FIELD || ctx->state == STATE_STRUCT_FIELD ||
ctx->state == STATE_UNION_FIELD ||
ctx->state == STATE_CLASS_PROPERTY || ctx->state == STATE_CLASS_PROPERTY ||
ctx->state == STATE_CLASS_FIELD || ctx->state == STATE_CLASS_FIELD ||
ctx->state == STATE_INTERFACE_FIELD || ctx->state == STATE_INTERFACE_FIELD ||
@ -2316,6 +2319,16 @@ end_element_handler (GMarkupParseContext *context,
state_switch (ctx, STATE_NAMESPACE); state_switch (ctx, STATE_NAMESPACE);
} }
break; break;
case STATE_UNION_FIELD:
if (strcmp ("type", element_name) == 0)
break;
if (require_end_element (context, ctx, "field", element_name, error))
{
state_switch (ctx, STATE_UNION);
}
break;
case STATE_UNION: case STATE_UNION:
if (require_end_element (context, ctx, "union", element_name, error)) if (require_end_element (context, ctx, "union", element_name, error))
{ {