From 810b95e02c50eb991e22d0772cf283d25adf7dc4 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 21 May 2019 14:59:08 +0200 Subject: [PATCH] Revert "glsl: do not use deprecated bison-keyword" This reverts commit eb85124a9f6e9cb94d0d4a99f91bbae374777e3a. --- src/compiler/glsl/glcpp/glcpp-parse.y | 2 +- src/compiler/glsl/glsl_parser.yy | 2 +- src/mesa/program/program_parse.y | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 736af7e680d..1c095cb66f9 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 -%define parse.error verbose +%error-verbose %locations %initial-action { diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index dc6aade2643..6426f890b9e 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 -%define parse.error verbose +%error-verbose %locations %initial-action { diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index 3d0c1e2ea9e..7398f5f507a 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 } -%define parse.error verbose +%error-verbose %union { struct asm_instruction *inst; -- 2.30.2