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

GVariant parser: match strings without consuming

Browse Source 
Add a new function that allows the parser to check that the current
token is equal to a given string without consuming the token.
Reimplement the 'consume' function in terms of the new function.
This commit is contained in:
Ryan Lortie 2011-03-31 14:45:50 +05:30
parent f6dff49136
commit 24ed841d6a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glib/gvariant-parser.c
View File

@ -303,22 +303,25 @@ token_stream_is_numeric (TokenStream *stream)
} }
static gboolean static gboolean
token_stream_consume (TokenStream *stream, token_stream_peek_string (TokenStream *stream,
const gchar *token) const gchar *token)
{ {
gint length = strlen (token); gint length = strlen (token);
if (!token_stream_prepare (stream)) return token_stream_prepare (stream) &&
stream->stream - stream->this == length &&
memcmp (stream->this, token, length) == 0;
}
static gboolean
token_stream_consume (TokenStream *stream,
const gchar *token)
{
if (!token_stream_peek_string (stream, token))
return FALSE; return FALSE;
if (stream->stream - stream->this == length && token_stream_next (stream);
memcmp (stream->this, token, length) == 0) return TRUE;
{
token_stream_next (stream);
return TRUE;
}
return FALSE;
} }
static gboolean static gboolean