com php-src: Upgrade deprecated directives and use non-posix bison: ext/json/json_parser.y sapi/phpdbg/phpdbg_parser.y scripts/dev/genfiles
| From: | Peter Kokot | Date: | Tue, 19 Mar 2019 19:29:20 +0000 |
| Subject: | com php-src: Upgrade deprecated directives and use non-posix bison: ext/json/json_parser.y sapi/phpdbg/phpdbg_parser.y scripts/dev/genfiles | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105261@lists.php.net to get a copy of this message | ||
Commit: 864366ef203b5faebf2cb183395d5165cf051a4f
Author: Peter Kokot <peterkokot@gmail.com> Tue, 19 Mar 2019 00:33:53 +0100
Parents: 38b22448f819aff57157d6f84d4cf3c88bcb657d
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=864366ef203b5faebf2cb183395d5165cf051a4f
Log:
Upgrade deprecated directives and use non-posix bison
With Bison 3.0 some directives are deprecated:
- %name-prefix "x" should be %define api.prefix {x}
- %error-verbose should be %define parse.error verbose
Bison 3.3 also started emiting more warnings and since PHP souce parsers
are not POSIX compliant this patch fixes this as pointed out via
495a46aa1dc564656bf919cb49aae48a31ae15f4.
Changed paths:
M ext/json/json_parser.y
M sapi/phpdbg/phpdbg_parser.y
M scripts/dev/genfiles
Diff:
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y
index aa37c03..c3d0976 100644
--- a/ext/json/json_parser.y
+++ b/ext/json/json_parser.y
@@ -47,7 +47,7 @@ int json_yydebug = 1;
}
%pure-parser
-%name-prefix "php_json_yy"
+%define api.prefix {php_json_yy}
%lex-param { php_json_parser *parser }
%parse-param { php_json_parser *parser }
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
index 88baa01..c4f6682 100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y
@@ -29,7 +29,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
%}
%pure-parser
-%error-verbose
+%define parse.error verbose
%code requires {
#include "phpdbg.h"
diff --git a/scripts/dev/genfiles b/scripts/dev/genfiles
index 4e3a6d6..c633429 100755
--- a/scripts/dev/genfiles
+++ b/scripts/dev/genfiles
@@ -35,7 +35,7 @@
# Parser generator
YACC=${YACC:-bison}
-YACC="$YACC -y -l"
+YACC="$YACC -l"
# Lexer generator
RE2C=${RE2C:-re2c}