rendernodeparser: Failing to parse a string is an error

Testcase included.

diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c
index 6cceafcad771e10b0c063dcbbae26d51aa089deb..e377e82d8beffea4c9b59fdd59067bede1cad51d 100644 (file)
--- a/gsk/gskrendernodeparser.c
+++ b/gsk/gskrendernodeparser.c
@@ -416,7 +416,10 @@ parse_string (GtkCssParser *parser,
 
   token = gtk_css_parser_get_token (parser);
   if (!gtk_css_token_is (token, GTK_CSS_TOKEN_STRING))
-    return FALSE;
+    {
+      gtk_css_parser_error_syntax (parser, "Expected a string");
+      return FALSE;
+    }
 
   s = g_strdup (gtk_css_token_get_string (token));
   gtk_css_parser_consume_token (parser);

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index e9abda85d213b4e21782a425ed6f8c02515335a7..0f90f509389c38a56afb93a18c1d8222e6d3b9d2 100644 (file)
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -232,6 +232,9 @@ node_parser_tests = [
   'shadow-fail.node',
   'shadow-fail.ref.node',
   'shadow-fail.errors',
+  'string-error.errors',
+  'string-error.node',
+  'string-error.ref.node',
   'testswitch.node',
   'text-fail.node',
   'text-fail.ref.node',

diff --git a/testsuite/gsk/nodeparser/string-error.errors b/testsuite/gsk/nodeparser/string-error.errors
new file mode 100644 (file)
index 0000000..47ad1d1
--- /dev/null
+++ b/testsuite/gsk/nodeparser/string-error.errors
@@ -0,0 +1 @@
+<data>:2:12-13: error: GTK_CSS_PARSER_ERROR_SYNTAX

diff --git a/testsuite/gsk/nodeparser/string-error.node b/testsuite/gsk/nodeparser/string-error.node
new file mode 100644 (file)
index 0000000..6e62f6a
--- /dev/null
+++ b/testsuite/gsk/nodeparser/string-error.node
@@ -0,0 +1,3 @@
+debug {
+  message: 5;
+}

diff --git a/testsuite/gsk/nodeparser/string-error.ref.node b/testsuite/gsk/nodeparser/string-error.ref.node
new file mode 100644 (file)
index 0000000..fc7e73a
--- /dev/null
+++ b/testsuite/gsk/nodeparser/string-error.ref.node
@@ -0,0 +1,6 @@
+debug {
+  child: color {
+    bounds: 0 0 50 50;
+    color: rgb(255,0,204);
+  }
+}