AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cssprovider: Parse strings as identifiers when parsing property values

Browse Source
This commit is contained in:
Benjamin Otte 2011-04-12 03:22:22 +02:00
parent 6b66efe873
commit 2a0ac6d102
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkcssprovider.c
View File

@ -1746,21 +1746,27 @@ scanner_apply_scope (GScanner *scanner,
if (scope == SCOPE_VALUE) if (scope == SCOPE_VALUE)
{ {
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_"; scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_\"'";
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(),.%\t\n'/\""; scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(),.%\t\n'/\"";
scanner->config->scan_identifier_1char = TRUE; scanner->config->scan_identifier_1char = TRUE;
scanner->config->scan_string_sq = FALSE;
scanner->config->scan_string_dq = FALSE;
} }
else if (scope == SCOPE_BINDING_SET) else if (scope == SCOPE_BINDING_SET)
{ {
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_"; scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_";
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(){}<>,.%\t\n'/\""; scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "@#-_ +(){}<>,.%\t\n'/\"";
scanner->config->scan_identifier_1char = TRUE; scanner->config->scan_identifier_1char = TRUE;
scanner->config->scan_string_sq = TRUE;
scanner->config->scan_string_dq = TRUE;
} }
else if (scope == SCOPE_SELECTOR) else if (scope == SCOPE_SELECTOR)
{ {
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "*@"; scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "*@";
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_#."; scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_#.";
scanner->config->scan_identifier_1char = TRUE; scanner->config->scan_identifier_1char = TRUE;
scanner->config->scan_string_sq = TRUE;
scanner->config->scan_string_dq = TRUE;
} }
else if (scope == SCOPE_PSEUDO_CLASS || else if (scope == SCOPE_PSEUDO_CLASS ||
scope == SCOPE_NTH_CHILD || scope == SCOPE_NTH_CHILD ||
@ -1769,6 +1775,8 @@ scanner_apply_scope (GScanner *scanner,
scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "-_"; scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "-_";
scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_"; scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z G_CSET_DIGITS "-_";
scanner->config->scan_identifier_1char = FALSE; scanner->config->scan_identifier_1char = FALSE;
scanner->config->scan_string_sq = TRUE;
scanner->config->scan_string_dq = TRUE;
} }
else else
g_assert_not_reached (); g_assert_not_reached ();
@ -2489,8 +2497,7 @@ parse_rule (GtkCssProvider *css_provider,
gtk_css_provider_error (css_provider, gtk_css_provider_error (css_provider,
scanner, scanner,
GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR,
scanner->token == G_TOKEN_STRING ? GTK_CSS_PROVIDER_ERROR_PROPERTY_VALUE GTK_CSS_PROVIDER_ERROR_SYNTAX,
: GTK_CSS_PROVIDER_ERROR_SYNTAX,
"Not a property value"); "Not a property value");
gtk_css_scanner_pop_scope (scanner); gtk_css_scanner_pop_scope (scanner);
goto find_end_of_declaration; goto find_end_of_declaration;