archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Use "%define parse.error verbose"
This commit is contained in:
Nikita Popov 2020-01-29 11:16:38 +01:00
commit a73df8e5f9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Zend/zend_ini_parser.y
View file

@ -1,3 +1,4 @@
%require "3.0"
%{
/*
+----------------------------------------------------------------------+
@ -31,7 +32,6 @@
#include "win32/syslog.h"
#endif
#define YYERROR_VERBOSE
#define YYSTYPE zval
int ini_parse(void);
@ -290,6 +290,7 @@ static void zval_ini_dtor(zval *zv)
%expect 0
%define api.pure full
%define parse.error verbose
%token TC_SECTION
%token TC_RAW

3
Zend/zend_language_parser.y
View file

@ -1,3 +1,4 @@
%require "3.0"
%{
/*
+----------------------------------------------------------------------+
@ -32,7 +33,6 @@
#define yytnamerr zend_yytnamerr
static YYSIZE_T zend_yytnamerr(char*, const char*);
#define YYERROR_VERBOSE
#define YYSTYPE zend_parser_stack_elem
#ifdef _MSC_VER
@ -43,6 +43,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%}
%define api.pure full
%define parse.error verbose
%expect 0
%code requires {