From: Erik Faye-Lund Date: Mon, 20 May 2019 11:29:05 +0000 (+0200) Subject: glsl: do not use deprecated bison-keyword X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb85124a9f6e9cb94d0d4a99f91bbae374777e3a;p=mesa.git glsl: do not use deprecated bison-keyword %error-verbose has been deprecated since Bison 3.0, which was released in 2013. In Bison 3.3.1 which was recently released, this has started causing warnings. Let's update the code to do this in the modern way intead, to avoid cluttering the output needlessly. Signed-off-by: Erik Faye-Lund Reviewed-by: Timothy Arceri --- diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 1c095cb66f9..736af7e680d 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -155,7 +155,7 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value); %} %pure-parser -%error-verbose +%define parse.error verbose %locations %initial-action { diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 6426f890b9e..dc6aade2643 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -81,7 +81,7 @@ static bool match_layout_qualifier(const char *s1, const char *s2, %expect 0 %pure-parser -%error-verbose +%define parse.error verbose %locations %initial-action { diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index 7398f5f507a..3d0c1e2ea9e 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -124,7 +124,7 @@ static struct asm_instruction *asm_instruction_copy_ctor( %locations %lex-param { struct asm_parser_state *state } %parse-param { struct asm_parser_state *state } -%error-verbose +%define parse.error verbose %union { struct asm_instruction *inst;