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

Bug 571248 - Ignore unknown elements in girparser

Browse Source 
We want the gir to be extensible.

svn path=/trunk/; revision=1096
This commit is contained in:
Colin Walters 2009-02-11 00:08:49 +00:00
parent 3490a56ba4
commit 97a2e7f5fc
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
girparser.c
View File

@ -66,7 +66,8 @@ typedef enum
STATE_CLASS_CONSTANT, STATE_CLASS_CONSTANT,
STATE_INTERFACE_CONSTANT, STATE_INTERFACE_CONSTANT,
STATE_ALIAS, STATE_ALIAS,
STATE_TYPE STATE_TYPE,
STATE_UNKNOWN
} ParseState; } ParseState;
typedef struct _ParseContext ParseContext; typedef struct _ParseContext ParseContext;
@ -75,6 +76,7 @@ struct _ParseContext
GIrParser *parser; GIrParser *parser;
ParseState state; ParseState state;
int unknown_depth;
ParseState prev_state; ParseState prev_state;
GList *modules; GList *modules;
@ -2640,15 +2642,15 @@ start_element_handler (GMarkupParseContext *context,
break; break;
} }
g_markup_parse_context_get_position (context, &line_number, &char_number); if (ctx->state != STATE_UNKNOWN)
{
if (error && *error == NULL) state_switch (ctx, STATE_UNKNOWN);
g_set_error (error, ctx->unknown_depth = 1;
G_MARKUP_ERROR, }
G_MARKUP_ERROR_UNKNOWN_ELEMENT, else
"Unexpected start tag '%s' on line %d char %d; current state=%d", {
element_name, ctx->unknown_depth += 1;
line_number, char_number, ctx->state); }
out: ; out: ;
if (*error) if (*error)
@ -3008,6 +3010,11 @@ end_element_handler (GMarkupParseContext *context,
end_type (ctx); end_type (ctx);
break; break;
} }
case STATE_UNKNOWN:
ctx->unknown_depth -= 1;
if (ctx->unknown_depth == 0)
state_switch (ctx, ctx->prev_state);
break;
default: default:
g_error ("Unhandled state %d in end_element_handler\n", ctx->state); g_error ("Unhandled state %d in end_element_handler\n", ctx->state);
} }