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, 85 insertions, 0 deletions

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
new file mode 100644
index 0000000000..609b9f56f1
--- /dev/null
+++ b/gtk/gtkcssparserprivate.h
@@ -0,0 +1,85 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_CSS_PARSER_PRIVATE_H__
+#define __GTK_CSS_PARSER_PRIVATE_H__
+
+#include <gtk/gtksymboliccolor.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GtkCssParser GtkCssParser;
+
+typedef void (* GtkCssParserErrorFunc) (GtkCssParser *parser,
+                                        const GError *error,
+                                        gpointer      user_data);
+
+GtkCssParser *  _gtk_css_parser_new               (const char            *data,
+                                                   GtkCssParserErrorFunc  error_func,
+                                                   gpointer               user_data);
+void            _gtk_css_parser_free              (GtkCssParser          *parser);
+
+void            _gtk_css_parser_error             (GtkCssParser          *parser,
+                                                   const char            *format,
+                                                    ...) G_GNUC_PRINTF (2, 3);
+
+guint           _gtk_css_parser_get_line          (GtkCssParser          *parser);
+guint           _gtk_css_parser_get_position      (GtkCssParser          *parser);
+
+gboolean        _gtk_css_parser_is_eof            (GtkCssParser          *parser);
+gboolean        _gtk_css_parser_begins_with       (GtkCssParser          *parser,
+                                                   char                   c);
+gboolean        _gtk_css_parser_is_string         (GtkCssParser          *parser);
+
+/* IMPORTANT:
+ * _try_foo() functions do not modify the data pointer if they fail, nor do they
+ * signal an error. _read_foo() will modify the data pointer and position it at
+ * the first token that is broken and emit an error about the failure.
+ * So only call _read_foo() when you know that you are reading a foo. _try_foo()
+ * however is fine to call if you don't know yet if the token is a foo or a bar,
+ * you can _try_bar() if try_foo() failed.
+ */
+gboolean        _gtk_css_parser_try               (GtkCssParser          *parser,
+                                                   const char            *string,
+                                                   gboolean               skip_whitespace);
+char *          _gtk_css_parser_try_ident         (GtkCssParser          *parser,
+                                                   gboolean               skip_whitespace);
+char *          _gtk_css_parser_try_name          (GtkCssParser          *parser,
+                                                   gboolean               skip_whitespace);
+gboolean        _gtk_css_parser_try_int           (GtkCssParser          *parser,
+                                                   int                   *value);
+gboolean        _gtk_css_parser_try_uint          (GtkCssParser          *parser,
+                                                   uint                  *value);
+gboolean        _gtk_css_parser_try_double        (GtkCssParser          *parser,
+                                                   gdouble               *value);
+
+void            _gtk_css_parser_skip_whitespace   (GtkCssParser          *parser);
+char *          _gtk_css_parser_read_string       (GtkCssParser          *parser);
+char *          _gtk_css_parser_read_uri          (GtkCssParser          *parser);
+char *          _gtk_css_parser_read_value        (GtkCssParser          *parser);
+GtkSymbolicColor *_gtk_css_parser_read_symbolic_color
+                                                  (GtkCssParser          *parser);
+
+void            _gtk_css_parser_resync            (GtkCssParser          *parser,
+                                                   gboolean               sync_at_semicolon,
+                                                   char                   terminator);
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_PARSER_PRIVATE_H__ */