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

GVariant: Stop lexing format strings at :

Browse Source 
Lets us parse this successfully: {%s: %s}.
This commit is contained in:
Ryan Lortie 2010-03-26 08:01:51 -05:00
parent df67a0662b
commit 409a3a61ec
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gvariant-parser.c
View File

@ -167,11 +167,12 @@ token_stream_prepare (TokenStream *stream)
break; break;
case '@': case '%': case '@': case '%':
/* stop at the first space, comma or unmatched bracket. /* stop at the first space, comma, colon or unmatched bracket.
* deals nicely with cases like (%i, %i). * deals nicely with cases like (%i, %i) or {%i: %i}.
*/ */
for (end = stream->stream + 1; for (end = stream->stream + 1;
end != stream->end && *end != ',' && !g_ascii_isspace (*end); end != stream->end && *end != ',' &&
*end != ':' && !g_ascii_isspace (*end);
end++) end++)
if (*end == '(' || *end == '{') if (*end == '(' || *end == '{')

1
glib/tests/gvariant.c
View File

@ -3678,6 +3678,7 @@ test_parse_positional (void)
" ('three', %u)]", "two", 3); " ('three', %u)]", "two", 3);
g_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("a(su)"))); g_assert (g_variant_is_of_type (value, G_VARIANT_TYPE ("a(su)")));
check_and_free (value, "[('one', 1), ('two', 2), ('three', 3)]"); check_and_free (value, "[('one', 1), ('two', 2), ('three', 3)]");
check_and_free (g_variant_new_parsed ("{%s:%i}", "one", 1), "{'one': 1}");
if (do_failed_test ("*GVariant format string*")) if (do_failed_test ("*GVariant format string*"))
{ {