[gtk/wip/otte/css: 62/79] cssparser: Pass in error locations explicitly



commit 42b6184ca7845831b46c65649bdb18b45d4a7eb4
Author: Benjamin Otte <otte redhat com>
Date:   Wed Apr 10 18:16:10 2019 +0200

    cssparser: Pass in error locations explicitly
    
    And for the quick function, use the start/end location of the current
    token.

 gtk/css/gtkcssparser.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/css/gtkcssparser.c b/gtk/css/gtkcssparser.c
index 1a4a7567a7..b3347ee067 100644
--- a/gtk/css/gtkcssparser.c
+++ b/gtk/css/gtkcssparser.c
@@ -511,8 +511,8 @@ gtk_css_parser_error_syntax (GtkCssParser *self,
                               GTK_CSS_PARSER_ERROR_SYNTAX,
                               format, args);
   gtk_css_parser_emit_error (self,
-                             &self->location,
-                             gtk_css_tokenizer_get_location (self->tokenizer),
+                             gtk_css_parser_get_start_location (self),
+                             gtk_css_parser_get_end_location (self),
                              error);
   g_error_free (error);
   va_end (args);
@@ -531,8 +531,8 @@ gtk_css_parser_error_value (GtkCssParser *self,
                               GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE,
                               format, args);
   gtk_css_parser_emit_error (self,
-                             &self->location,
-                             gtk_css_tokenizer_get_location (self->tokenizer),
+                             gtk_css_parser_get_start_location (self),
+                             gtk_css_parser_get_end_location (self),
                              error);
   g_error_free (error);
   va_end (args);
@@ -551,8 +551,8 @@ gtk_css_parser_error_import (GtkCssParser *self,
                               GTK_CSS_PARSER_ERROR_IMPORT,
                               format, args);
   gtk_css_parser_emit_error (self,
-                             &self->location,
-                             gtk_css_tokenizer_get_location (self->tokenizer),
+                             gtk_css_parser_get_start_location (self),
+                             gtk_css_parser_get_end_location (self),
                              error);
   g_error_free (error);
   va_end (args);
@@ -571,8 +571,8 @@ gtk_css_parser_warn_syntax (GtkCssParser *self,
                               GTK_CSS_PARSER_WARNING_SYNTAX,
                               format, args);
   gtk_css_parser_emit_error (self,
-                             &self->location,
-                             gtk_css_tokenizer_get_location (self->tokenizer),
+                             gtk_css_parser_get_start_location (self),
+                             gtk_css_parser_get_end_location (self),
                              error);
   g_error_free (error);
   va_end (args);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]