From bebd167d7455e1fd03da7476360f11505af3fb0f Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 15 Dec 2023 22:00:07 +0800 Subject: [PATCH] =?UTF-8?q?glsl:=20Fixes=20warning:=20deprecated=20directi?= =?UTF-8?q?ve:=20=E2=80=98%pure-parser=E2=80=99,=20=E2=80=98%error-verbose?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../../src/compiler/glsl/glcpp/glcpp-parse.y:179.1-12: warning: deprecated directive: ‘%pure-parser’, use ‘%define api.pure’ [-Wdeprecated] 179 | %pure-parser | ^~~~~~~~~~~~ | %define api.pure ../../src/compiler/glsl/glcpp/glcpp-parse.y:180.1-14: warning: deprecated directive: ‘%error-verbose’, use ‘%define parse.error verbose’ [-Wdeprecated] 180 | %error-verbose | ^~~~~~~~~~~~~~ | %define parse.error verbose Signed-off-by: Yonggang Luo Reviewed-by: Eric Engestrom Part-of: --- src/compiler/glsl/glcpp/glcpp-parse.y | 4 ++-- src/compiler/glsl/glsl_parser.yy | 4 ++-- src/freedreno/afuc/parser.y | 2 +- src/freedreno/ir3/ir3_parser.y | 2 +- src/mesa/program/program_parse.y | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index b3c16f18332..195588f512a 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -176,8 +176,8 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value); %} -%pure-parser -%error-verbose +%define api.pure +%define parse.error verbose %locations %initial-action { diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 55b95ca7895..8177453b411 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -82,8 +82,8 @@ static bool match_layout_qualifier(const char *s1, const char *s2, %expect 0 -%pure-parser -%error-verbose +%define api.pure +%define parse.error verbose %locations %initial-action { diff --git a/src/freedreno/afuc/parser.y b/src/freedreno/afuc/parser.y index aeba1ed8a22..66ba951d373 100644 --- a/src/freedreno/afuc/parser.y +++ b/src/freedreno/afuc/parser.y @@ -185,7 +185,7 @@ label(const char *str) %type xmov %type peek -%error-verbose +%define parse.error verbose %start instrs diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index 84d72be219a..b198966d1c3 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -804,7 +804,7 @@ static void print_token(FILE *file, int type, YYSTYPE value) %type const_val cat6_src_shift %type buf_type -%error-verbose +%define parse.error verbose %start shader diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index c227a03e8ad..736adfae8b4 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -128,11 +128,11 @@ static struct asm_instruction *asm_instruction_copy_ctor( } while(0) %} -%pure-parser +%define api.pure %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;