css: Rewrite the parser

Instead of relying on GScanner and its idea of syntax, code up a parser
that obeys the CSS spec.
This also has the great side effect of reporting correct line numbers
and positions.

Also included is a reorganization of the returned error values. Instead
of error values describing what type of syntax error was returned, the
code just returns SYNTAX_ERROR. Other messages exist for when actual
values don't work or when errors shouldn't be fatal due to backwards
compatibility.

1 files changed, 2 insertions, 8 deletions

diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index 65292dfce1..b49640c8c2 100644
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -37,15 +37,9 @@ typedef enum
 {
   GTK_CSS_PROVIDER_ERROR_FAILED,
   GTK_CSS_PROVIDER_ERROR_SYNTAX,
-  GTK_CSS_PROVIDER_ERROR_PROPERTY_NAME,
-  GTK_CSS_PROVIDER_ERROR_PROPERTY_VALUE,
-  GTK_CSS_PROVIDER_ERROR_SELECTOR,
-  GTK_CSS_PROVIDER_ERROR_COMBINATOR,
-  GTK_CSS_PROVIDER_ERROR_CLASS,
-  GTK_CSS_PROVIDER_ERROR_PSEUDO_CLASS,
-  GTK_CSS_PROVIDER_ERROR_AT_RULE,
   GTK_CSS_PROVIDER_ERROR_IMPORT,
-  GTK_CSS_PROVIDER_ERROR_DEFINE_COLOR
+  GTK_CSS_PROVIDER_ERROR_NAME,
+  GTK_CSS_PROVIDER_ERROR_DEPRECATED
 } GtkCssProviderError;
 
 GQuark gtk_css_provider_error_quark (void);