callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make invalid stylesheets fail to parse again

Browse Source 
The recent improvements to error reporting caused gtk_css_provider_load...
to always return TRUE and leave the error unset. Error messages were instead
dumped out with g_message, which is not helpful.

This commit changes things back to the way they were before:
If a GError is passed in, parsing will fail at the first error, reporting
it in the given GError. If no GError is passed in, we keep going and
just issue the warning messages. This fixes the parser tests.
This commit is contained in:
Matthias Clasen
2010-12-06 00:44:58 -05:00
parent 94c9eb72ce
commit f1fafca6ca
1 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
gtk/gtkcssprovider.c
View File

@ -791,11 +791,6 @@ static gboolean gtk_css_provider_load_from_path_internal (GtkCssProvider *css_p
gboolean reset, gboolean reset,
GError **error); GError **error);
enum {
CSS_PROVIDER_PARSE_ERROR
};
GQuark GQuark
gtk_css_provider_error_quark (void) gtk_css_provider_error_quark (void)
{ {
@ -1375,7 +1370,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
(info->state == 0 || (info->state == 0 ||
info->state == state || info->state == state ||
((info->state & state) != 0 && ((info->state & state) != 0 &&
(info->state & ~(state)) == 0))) (info->state & ~(state)) == 0)))
{ {
const gchar *val_str; const gchar *val_str;
@ -1880,7 +1875,7 @@ parse_selector (GtkCssProvider *css_provider,
static GtkSymbolicColor * static GtkSymbolicColor *
symbolic_color_parse_str (const gchar *string, symbolic_color_parse_str (const gchar *string,
gchar **end_ptr) gchar **end_ptr)
{ {
GtkSymbolicColor *symbolic_color = NULL; GtkSymbolicColor *symbolic_color = NULL;
gchar *str; gchar *str;
@ -2073,7 +2068,7 @@ symbolic_color_parse_str (const gchar *string,
*end_ptr = (gchar *) str; *end_ptr = (gchar *) str;
if (str[0] != ')') if (str[0] != ')')
{ {
gtk_symbolic_color_unref (color1); gtk_symbolic_color_unref (color1);
gtk_symbolic_color_unref (color2); gtk_symbolic_color_unref (color2);
return NULL; return NULL;
@ -2142,8 +2137,8 @@ symbolic_color_parse (const gchar *str,
if (*end != '\0') if (*end != '\0')
{ {
g_set_error_literal (error, g_set_error_literal (error,
gtk_css_provider_error_quark (), GTK_CSS_PROVIDER_ERROR,
CSS_PROVIDER_PARSE_ERROR, GTK_CSS_PROVIDER_ERROR_FAILED,
"Could not parse symbolic color"); "Could not parse symbolic color");
if (color) if (color)
@ -2519,8 +2514,8 @@ path_parse (GtkCssProvider *css_provider,
if (*end != '\0') if (*end != '\0')
{ {
g_set_error_literal (error, g_set_error_literal (error,
gtk_css_provider_error_quark (), GTK_CSS_PROVIDER_ERROR,
CSS_PROVIDER_PARSE_ERROR, GTK_CSS_PROVIDER_ERROR_FAILED,
"Error parsing path"); "Error parsing path");
g_free (path); g_free (path);
path = NULL; path = NULL;
@ -2739,27 +2734,29 @@ css_provider_parse_value (GtkCssProvider *css_provider,
if (type == GDK_TYPE_RGBA || if (type == GDK_TYPE_RGBA ||
type == GDK_TYPE_COLOR) type == GDK_TYPE_COLOR)
{ {
GdkRGBA color; GdkRGBA rgba;
GdkColor rgb; GdkColor color;
if (type == GDK_TYPE_RGBA && if (type == GDK_TYPE_RGBA &&
gdk_rgba_parse (&color, value_str)) gdk_rgba_parse (&rgba, value_str))
g_value_set_boxed (value, &color); g_value_set_boxed (value, &rgba);
else if (type == GDK_TYPE_COLOR && else if (type == GDK_TYPE_COLOR &&
gdk_color_parse (value_str, &rgb)) gdk_color_parse (value_str, &color))
g_value_set_boxed (value, &rgb); g_value_set_boxed (value, &color);
else else
{ {
GtkSymbolicColor *symbolic_color; GtkSymbolicColor *symbolic_color;
symbolic_color = symbolic_color_parse_str (value_str, &end); symbolic_color = symbolic_color_parse_str (value_str, &end);
if (!symbolic_color) if (symbolic_color)
return FALSE; {
g_value_unset (value);
g_value_unset (value); g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR);
g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR); g_value_take_boxed (value, symbolic_color);
g_value_take_boxed (value, symbolic_color); }
else
parsed = FALSE;
} }
} }
else if (type == PANGO_TYPE_FONT_DESCRIPTION) else if (type == PANGO_TYPE_FONT_DESCRIPTION)
@ -2790,7 +2787,10 @@ css_provider_parse_value (GtkCssProvider *css_provider,
GtkThemingEngine *engine; GtkThemingEngine *engine;
engine = gtk_theming_engine_load (value_str); engine = gtk_theming_engine_load (value_str);
g_value_set_object (value, engine); if (engine)
g_value_set_object (value, engine);
else
parsed = FALSE;
} }
else if (type == GTK_TYPE_ANIMATION_DESCRIPTION) else if (type == GTK_TYPE_ANIMATION_DESCRIPTION)
{ {
@ -2878,8 +2878,11 @@ css_provider_parse_value (GtkCssProvider *css_provider,
if (!enum_value) if (!enum_value)
{ {
g_warning ("Unknown value '%s' for enum type '%s'", g_set_error (error,
value_str, g_type_name (type)); GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown value '%s' for enum type '%s'",
value_str, g_type_name (type));
parsed = FALSE; parsed = FALSE;
} }
else else
@ -2912,8 +2915,11 @@ css_provider_parse_value (GtkCssProvider *css_provider,
if (!flag_value) if (!flag_value)
{ {
g_warning ("Unknown flag '%s' for type '%s'", g_set_error (error,
value_str, g_type_name (type)); GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown flag '%s' for type '%s'",
value_str, g_type_name (type));
parsed = FALSE; parsed = FALSE;
} }
else else
@ -2928,8 +2934,11 @@ css_provider_parse_value (GtkCssProvider *css_provider,
if (!flag_value) if (!flag_value)
{ {
g_warning ("Unknown flag '%s' for type '%s'", g_set_error (error,
value_str, g_type_name (type)); GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Unknown flag '%s' for type '%s'",
value_str, g_type_name (type));
parsed = FALSE; parsed = FALSE;
} }
else else
@ -2953,7 +2962,11 @@ css_provider_parse_value (GtkCssProvider *css_provider,
} }
else else
{ {
g_warning ("Cannot parse string '%s' for type %s", value_str, g_type_name (type)); g_set_error (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Cannot parse string '%s' for type %s",
value_str, g_type_name (type));
parsed = FALSE; parsed = FALSE;
} }
@ -2966,8 +2979,8 @@ css_provider_parse_value (GtkCssProvider *css_provider,
if (error && !*error) if (error && !*error)
g_set_error_literal (error, g_set_error_literal (error,
gtk_css_provider_error_quark (), GTK_CSS_PROVIDER_ERROR,
CSS_PROVIDER_PARSE_ERROR, GTK_CSS_PROVIDER_ERROR_FAILED,
"Failed to parse value"); "Failed to parse value");
} }
@ -3320,6 +3333,9 @@ parse_stylesheet (GtkCssProvider *css_provider,
GError **error) GError **error)
{ {
GtkCssProviderPrivate *priv; GtkCssProviderPrivate *priv;
gboolean result;
result = TRUE;
priv = css_provider->priv; priv = css_provider->priv;
g_scanner_get_next_token (priv->scanner); g_scanner_get_next_token (priv->scanner);
@ -3334,7 +3350,26 @@ parse_stylesheet (GtkCssProvider *css_provider,
if (expected_token != G_TOKEN_NONE) if (expected_token != G_TOKEN_NONE)
{ {
scanner_report_warning (css_provider, expected_token, err); /* If a GError was passed in, propagate the error and bail out,
* else report a warning and keep going
*/
if (error != NULL)
{
result = FALSE;
if (err)
g_propagate_error (error, err);
else
g_set_error_literal (error,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_FAILED,
"Error parsing stylesheet");
break;
}
else
{
scanner_report_warning (css_provider, expected_token, err);
g_clear_error (&err);
}
while (!g_scanner_eof (priv->scanner) && while (!g_scanner_eof (priv->scanner) &&
priv->scanner->token != G_TOKEN_RIGHT_CURLY) priv->scanner->token != G_TOKEN_RIGHT_CURLY)
@ -3343,11 +3378,10 @@ parse_stylesheet (GtkCssProvider *css_provider,
else else
css_provider_commit (css_provider); css_provider_commit (css_provider);
g_clear_error (&err);
g_scanner_get_next_token (priv->scanner); g_scanner_get_next_token (priv->scanner);
} }
return TRUE; return result;
} }
/** /**
@ -3650,7 +3684,7 @@ gtk_css_provider_get_default (void)
".check:hover, .radio:hover {\n" ".check:hover, .radio:hover {\n"
" background-color: @base_color;\n" " background-color: @base_color;\n"
" border-color: @fg_color;\n" " border-color: @fg_color;\n"
" color: @text_color;\n" " color: @text_color;\n"
" border-style: solid;\n" " border-style: solid;\n"
" border-width: 1;\n" " border-width: 1;\n"
"}\n" "}\n"