AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cssparser: Get rid of _gtk_css_parser_try_double()

Browse Source 
Use gtk_css_parser_consume_number() everywhere instead.
This commit is contained in:
Benjamin Otte 2019-04-05 02:16:00 +02:00
parent f0d2f99239
commit 23080d47b5
4 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcsscolorvalue.c
View File

@ -548,11 +548,9 @@ _gtk_css_color_value_parse_function (GtkCssParser *parser,
return NULL;
}
if (!_gtk_css_parser_try_double (parser, &tmp))
{
_gtk_css_parser_error (parser, "Invalid number for color value");
return NULL;
}
if (!gtk_css_parser_consume_number (parser, &tmp))
return NULL;
if (_gtk_css_parser_try (parser, "%", TRUE))
tmp /= 100.0;
else
@ -575,11 +573,8 @@ _gtk_css_color_value_parse_function (GtkCssParser *parser,
return NULL;
}
if (!_gtk_css_parser_try_double (parser, &rgba.alpha))
{
_gtk_css_parser_error (parser, "Invalid number for alpha value");
return NULL;
}
if (!gtk_css_parser_consume_number (parser, &rgba.alpha))
return NULL;
}
else
rgba.alpha = 1.0;
@ -626,9 +621,8 @@ _gtk_css_color_value_parse_function (GtkCssParser *parser,
return NULL;
}
if (!_gtk_css_parser_try_double (parser, &d))
if (!gtk_css_parser_consume_number (parser, &d))
{
_gtk_css_parser_error (parser, "Expected number in color definition");
_gtk_css_value_unref (child1);
if (child2)
_gtk_css_value_unref (child2);

2
gtk/gtkcsskeyframes.c
View File

@ -339,7 +339,7 @@ _gtk_css_keyframes_parse (GtkCssParser *parser)
progress = 0;
else if (gtk_css_parser_try_ident (parser, "to"))
progress = 1;
else if (_gtk_css_parser_try_double (parser, &progress) &&
else if (gtk_css_parser_consume_number (parser, &progress) &&
_gtk_css_parser_try (parser, "%", TRUE))
{
if (progress < 0 || progress > 100)

37
gtk/gtkcssparser.c
View File

@ -775,26 +775,28 @@ _gtk_css_parser_try_int (GtkCssParser *parser,
}
gboolean
_gtk_css_parser_try_double (GtkCssParser *parser,
gdouble *value)
gtk_css_parser_consume_number (GtkCssParser *self,
double *number)
{
gdouble result;
char *end;
g_return_val_if_fail (GTK_IS_CSS_PARSER (parser), FALSE);
g_return_val_if_fail (value != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CSS_PARSER (self), FALSE);
g_return_val_if_fail (number != NULL, FALSE);
errno = 0;
result = g_ascii_strtod (parser->data, &end);
if (errno)
return FALSE;
if (parser->data == end)
return FALSE;
result = g_ascii_strtod (self->data, &end);
if (errno ||
self->data == end)
{
_gtk_css_parser_error (self, "Expected a number");
return FALSE;
}
parser->data = end;
*value = result;
self->data = end;
*number = result;
_gtk_css_parser_skip_whitespace (parser);
_gtk_css_parser_skip_whitespace (self);
return TRUE;
}
@ -811,17 +813,6 @@ gtk_css_parser_consume_ident (GtkCssParser *self)
return result;
}
gboolean
gtk_css_parser_consume_number (GtkCssParser *self,
double *number)
{
if (_gtk_css_parser_try_double (self, number))
return TRUE;
_gtk_css_parser_error (self, "Expected a number");
return FALSE;
}
gboolean
_gtk_css_parser_has_number (GtkCssParser *parser)
{

2
gtk/gtkcssparserprivate.h
View File

@ -92,8 +92,6 @@ 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_double (GtkCssParser *parser,
gdouble *value);
gboolean _gtk_css_parser_try_hash_color (GtkCssParser *parser,
GdkRGBA *rgba);