diff options
| -rw-r--r-- | gtk/gtkcsskeyframes.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcssparser.c | 8 | ||||
| -rw-r--r-- | gtk/gtkcssparserprivate.h | 1 | ||||
| -rw-r--r-- | gtk/gtkcssprovider.c | 12 | ||||
| -rw-r--r-- | gtk/gtkcssselector.c | 4 | ||||
| -rw-r--r-- | gtk/gtkcssshadowvalue.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcssshorthandpropertyimpl.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 2 |
8 files changed, 12 insertions, 21 deletions
diff --git a/gtk/gtkcsskeyframes.c b/gtk/gtkcsskeyframes.c index de43bc6ab0..12344965a4 100644 --- a/gtk/gtkcsskeyframes.c +++ b/gtk/gtkcsskeyframes.c @@ -312,7 +312,7 @@ parse_block (GtkCssKeyframes *keyframes, if (!parse_declaration (keyframes, k, parser)) _gtk_css_parser_resync (parser, TRUE, '}'); - if (_gtk_css_parser_is_eof (parser)) + if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF)) { _gtk_css_parser_error (parser, "Expected closing '}' after keyframes block"); return FALSE; diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c index cd9970bbf0..66f0ad8ef2 100644 --- a/gtk/gtkcssparser.c +++ b/gtk/gtkcssparser.c @@ -91,14 +91,6 @@ _gtk_css_parser_free (GtkCssParser *parser) } gboolean -_gtk_css_parser_is_eof (GtkCssParser *parser) -{ - g_return_val_if_fail (GTK_IS_CSS_PARSER (parser), TRUE); - - return *parser->data == 0; -} - -gboolean _gtk_css_parser_has_prefix (GtkCssParser *parser, const char *prefix) { diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h index 683246a6f8..001d2060e5 100644 --- a/gtk/gtkcssparserprivate.h +++ b/gtk/gtkcssparserprivate.h @@ -62,7 +62,6 @@ GFile * _gtk_css_parser_get_file (GtkCssParser *parser GFile * _gtk_css_parser_get_file_for_path (GtkCssParser *parser, const char *path); -gboolean _gtk_css_parser_is_eof (GtkCssParser *parser); gboolean _gtk_css_parser_has_prefix (GtkCssParser *parser, const char *prefix); gboolean gtk_css_parser_has_token (GtkCssParser *parser, diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 1e1f987692..3658b18d1e 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -948,7 +948,7 @@ parse_keyframes (GtkCssScanner *scanner) GTK_CSS_PARSER_ERROR, GTK_CSS_PARSER_ERROR_SYNTAX, "expected '}' after declarations"); - if (!_gtk_css_parser_is_eof (scanner->parser)) + if (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF)) _gtk_css_parser_resync (scanner->parser, FALSE, 0); } @@ -1051,7 +1051,7 @@ parse_declaration (GtkCssScanner *scanner, if (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_SEMICOLON) && !gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_CLOSE_CURLY) && - !_gtk_css_parser_is_eof (scanner->parser)) + !gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF)) { gtk_css_provider_error (scanner->provider, scanner, @@ -1101,7 +1101,7 @@ check_for_semicolon: if (!_gtk_css_parser_try (scanner->parser, ";", TRUE)) { if (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_CLOSE_CURLY) && - !_gtk_css_parser_is_eof (scanner->parser)) + !gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF)) { gtk_css_provider_error_literal (scanner->provider, scanner, @@ -1117,7 +1117,7 @@ static void parse_declarations (GtkCssScanner *scanner, GtkCssRuleset *ruleset) { - while (!_gtk_css_parser_is_eof (scanner->parser) && + while (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF) && !gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_CLOSE_CURLY)) { parse_declaration (scanner, ruleset); @@ -1161,7 +1161,7 @@ parse_ruleset (GtkCssScanner *scanner) GTK_CSS_PARSER_ERROR, GTK_CSS_PARSER_ERROR_SYNTAX, "expected '}' after declarations"); - if (!_gtk_css_parser_is_eof (scanner->parser)) + if (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF)) { _gtk_css_parser_resync (scanner->parser, FALSE, 0); g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free); @@ -1191,7 +1191,7 @@ parse_stylesheet (GtkCssScanner *scanner) _gtk_css_parser_skip_whitespace (scanner->parser); - while (!_gtk_css_parser_is_eof (scanner->parser)) + while (!gtk_css_parser_has_token (scanner->parser, GTK_CSS_TOKEN_EOF)) { if (_gtk_css_parser_try (scanner->parser, "<!--", TRUE) || _gtk_css_parser_try (scanner->parser, "-->", TRUE)) diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c index 1e207221c5..e653e69b98 100644 --- a/gtk/gtkcssselector.c +++ b/gtk/gtkcssselector.c @@ -1250,7 +1250,7 @@ parse_simple_selector (GtkCssParser *parser, parsed_something = TRUE; } - while (selector && !_gtk_css_parser_is_eof (parser)); + while (selector && !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF)); _gtk_css_parser_skip_whitespace (parser); @@ -1263,7 +1263,7 @@ _gtk_css_selector_parse (GtkCssParser *parser) GtkCssSelector *selector = NULL; while ((selector = parse_simple_selector (parser, selector)) && - !_gtk_css_parser_is_eof (parser) && + !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) && !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) && !gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_OPEN_CURLY)) { diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index e87d753e1c..bd8746ab13 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -204,7 +204,7 @@ _gtk_css_shadow_value_new_for_transition (GtkCssValue *target) static gboolean value_is_done_parsing (GtkCssParser *parser) { - return _gtk_css_parser_is_eof (parser) || + return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SEMICOLON) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_CLOSE_CURLY); diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index c553fc9709..3b32c7f282 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -50,7 +50,7 @@ static gboolean value_is_done_parsing (GtkCssParser *parser) { - return _gtk_css_parser_is_eof (parser) || + return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SEMICOLON) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_CLOSE_CURLY); diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index a563940896..77a3d5f719 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -480,7 +480,7 @@ parse_font_kerning (GtkCssStyleProperty *property, static gboolean value_is_done_parsing (GtkCssParser *parser) { - return _gtk_css_parser_is_eof (parser) || + return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SEMICOLON) || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_CLOSE_CURLY); |