Revert "glsl: do not use deprecated bison-keyword"

This reverts commit eb85124a9f6e9cb94d0d4a99f91bbae374777e3a.

diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
index 736af7e680dff4c2161bfcbe137d78be9a6c6c33..1c095cb66f9fc616bff8019755b9d1c07ee392fb 100644 (file)
--- 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 dc6aade26439527dc1ab621ff9c62286d19b7f40..6426f890b9e622e6da0b5f486b8c6e75a7c43793 100644 (file)
--- 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 3d0c1e2ea9ee6c6a57929128e8d48ee136c36698..7398f5f507a08f06e07b9543462caddb8f80b8fb 100644 (file)
--- 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;