From 194ffefb9e28570b7651812e47b1b1bbba761d14 Mon Sep 17 00:00:00 2001 From: Joey Date: Mon, 8 Aug 2016 19:31:28 +0100 Subject: [PATCH 1/2] Corrected typo in comment Finger-key interface malfunction. --- Zend/zend_compile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 78ee3ddb5e8..56b80eed6a3 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -449,7 +449,7 @@ struct _zend_execute_data { const zend_op *opline; /* executed opline */ zend_execute_data *call; /* current call */ zval *return_value; - zend_function *func; /* executed funcrion */ + zend_function *func; /* executed function */ zval This; /* this + call_info + num_args */ zend_execute_data *prev_execute_data; zend_array *symbol_table; From b33e9651117d8f7cfa6b469a8a6bda68d82b4365 Mon Sep 17 00:00:00 2001 From: Davey Shafik Date: Thu, 4 Aug 2016 09:14:41 -0700 Subject: [PATCH 2/2] Use non-deprecated %pure-parser --- Zend/zend_ini_parser.y | 2 +- Zend/zend_language_parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 1078259f224..a08fa037685 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -260,7 +260,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s %} %expect 0 -%pure_parser +%pure-parser %token TC_SECTION %token TC_RAW diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index c3f51e30531..957d6579099 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -43,7 +43,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %} -%pure_parser +%pure-parser %expect 0 %code requires {