luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 11:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

girparser: Clean up passthrough handling

Browse Source 
Instead of remembering to have to set unknown_depth, smarten up
state_switch to do it for us.

https://bugzilla.gnome.org/show_bug.cgi?id=693040
This commit is contained in:
Jasper St. Pierre 2013-01-31 23:02:02 -05:00
parent 37791c8267
commit 06dfbc7dcb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
girparser.c
View File

@ -341,6 +341,9 @@ state_switch (ParseContext *ctx, ParseState newstate)
g_assert (ctx->state != newstate); g_assert (ctx->state != newstate);
ctx->prev_state = ctx->state; ctx->prev_state = ctx->state;
ctx->state = newstate; ctx->state = newstate;
if (ctx->state == STATE_PASSTHROUGH)
ctx->unknown_depth = 1;
} }
static GIrNode * static GIrNode *
@ -724,10 +727,7 @@ introspectable_prelude (GMarkupParseContext *context,
if (introspectable) if (introspectable)
state_switch (ctx, new_state); state_switch (ctx, new_state);
else else
{
state_switch (ctx, STATE_PASSTHROUGH); state_switch (ctx, STATE_PASSTHROUGH);
ctx->unknown_depth = 1;
}
return introspectable; return introspectable;
} }
@ -2751,7 +2751,6 @@ start_element_handler (GMarkupParseContext *context,
if (strcmp (element_name, "doc") == 0) if (strcmp (element_name, "doc") == 0)
{ {
state_switch (ctx, STATE_PASSTHROUGH); state_switch (ctx, STATE_PASSTHROUGH);
ctx->unknown_depth = 1;
goto out; goto out;
} }
break; break;
@ -3014,7 +3013,6 @@ start_element_handler (GMarkupParseContext *context,
ctx->file_path, line_number, char_number, element_name, ctx->file_path, line_number, char_number, element_name,
ctx->state); ctx->state);
state_switch (ctx, STATE_PASSTHROUGH); state_switch (ctx, STATE_PASSTHROUGH);
ctx->unknown_depth = 1;
} }
out: out: