[gtk/wip/otte/css: 7/10] cssparser: Add gtk_css_parser_consume_ident()

[Benjamin Otte <otte src gnome org>]

commit 077027352b30f53549a9b5a408f35bddc76eff2c
Author: Benjamin Otte <otte redhat com>
Date:   Sun Mar 31 12:40:53 2019 +0200

    cssparser: Add gtk_css_parser_consume_ident()
    
    And use it to fix the palette parser.

 gtk/gtkcsspalettevalue.c  |  7 +++----
 gtk/gtkcssparser.c        | 12 ++++++++++++
 gtk/gtkcssparserprivate.h |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcsspalettevalue.c b/gtk/gtkcsspalettevalue.c
index ac9088482c..3514ac6bbb 100644
--- a/gtk/gtkcsspalettevalue.c
+++ b/gtk/gtkcsspalettevalue.c
@@ -216,16 +216,15 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
   GtkCssValue *result, *color;
   char *ident;
 
-  if (_gtk_css_parser_try (parser, "default", TRUE))
+  if (gtk_css_parser_try_ident (parser, "default"))
     return gtk_css_palette_value_new_default ();
   
   result = gtk_css_palette_value_new_empty ();
 
   do {
-    ident = _gtk_css_parser_try_ident (parser, TRUE);
+    ident = gtk_css_parser_consume_ident (parser);
     if (ident == NULL)
       {
-        _gtk_css_parser_error (parser, "expected color name");
         _gtk_css_value_unref (result);
         return NULL;
       }
@@ -240,7 +239,7 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
 
     gtk_css_palette_value_add_color (result, ident, color);
     g_free (ident);
-  } while (_gtk_css_parser_try (parser, ",", TRUE));
+  } while (gtk_css_parser_try_token (parser, GTK_CSS_TOKEN_COMMA));
 
   return result;
 }
diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 806cc2701c..007cc7eacd 100644
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -766,6 +766,18 @@ _gtk_css_parser_try_double (GtkCssParser *parser,
   return TRUE;
 }
 
+char *
+gtk_css_parser_consume_ident (GtkCssParser *self)
+{
+  char *result;
+
+  result = _gtk_css_parser_try_ident (self, TRUE);
+  if (result == NULL)
+    _gtk_css_parser_error (self, "Expected an identifier");
+
+  return result;
+}
+
 gboolean
 gtk_css_parser_consume_number (GtkCssParser *self,
                                double       *number)
diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index e4b763a826..683246a6f8 100644
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -96,6 +96,7 @@ gboolean        _gtk_css_parser_try_double        (GtkCssParser          *parser
 gboolean        _gtk_css_parser_try_hash_color    (GtkCssParser          *parser,
                                                    GdkRGBA               *rgba);
 
+char *          gtk_css_parser_consume_ident      (GtkCssParser          *self);
 gboolean        gtk_css_parser_consume_number     (GtkCssParser          *self,
                                                    double                *number);
 gboolean        gtk_css_parser_consume_function   (GtkCssParser          *self,