diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index e6758a6ab98..20718bc4524 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); %} -%define api.pure -%define parse.error verbose +%pure-parser +%error-verbose %locations %initial-action { diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index edb34bd0f03..90bd48eafbb 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 -%define api.pure -%define parse.error verbose +%pure-parser +%error-verbose %locations %initial-action { diff --git a/src/freedreno/afuc/parser.y b/src/freedreno/afuc/parser.y index 66ba951d373..aeba1ed8a22 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 -%define parse.error verbose +%error-verbose %start instrs diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index 0f77c455419..ce52cfefe9b 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -477,7 +477,7 @@ static void print_token(FILE *file, int type, YYSTYPE value) %type const_val cat6_src_shift %type buf_type -%define parse.error verbose +%error-verbose %start shader diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index 15c46e830e3..5da469855b5 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) %} -%define api.pure +%pure-parser %locations %lex-param { struct asm_parser_state *state } %parse-param { struct asm_parser_state *state } -%define parse.error verbose +%error-verbose %union { struct asm_instruction *inst;