[gtk+/wip/otte/shader: 193/226] gsksl: Don't pass matcher to function argument parser
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/otte/shader: 193/226] gsksl: Don't pass matcher to function argument parser
- Date: Mon, 30 Oct 2017 02:16:45 +0000 (UTC)
commit d59333da9ecb6ca5a1e7c065fd59054dd32ec864
Author: Benjamin Otte <otte redhat com>
Date: Tue Oct 17 20:00:51 2017 +0200
gsksl: Don't pass matcher to function argument parser
... when an error has occured. That way we avoid duplicate error
messages for nonexisting functions.
gsk/gskslexpression.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gsk/gskslexpression.c b/gsk/gskslexpression.c
index 231d9ad..21cb1d1 100644
--- a/gsk/gskslexpression.c
+++ b/gsk/gskslexpression.c
@@ -1980,9 +1980,12 @@ gsk_sl_expression_parse_primary (GskSlScope *scope,
gsk_sl_scope_match_function (scope, &matcher, name);
if (!gsk_sl_function_matcher_has_matches (&matcher))
- gsk_sl_preprocessor_error (stream, DECLARATION, "No function named \"%s\".", name);
-
- expr = gsk_sl_expression_parse_function_call (scope, stream, &matcher);
+ {
+ gsk_sl_preprocessor_error (stream, DECLARATION, "No function named \"%s\".", name);
+ expr = gsk_sl_expression_parse_function_call (scope, stream, NULL);
+ }
+ else
+ expr = gsk_sl_expression_parse_function_call (scope, stream, &matcher);
gsk_sl_function_matcher_finish (&matcher);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]