Add support for Bison 3.x

TSRM/TSRM.h

@@ -164,8 +164,10 @@ TSRM_API void tsrm_free_interpreter_context(void *context);
 #define TSRMG(id, type, element)	(((type) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
 #define TSRMLS_D	void ***tsrm_ls
 #define TSRMLS_DC	, TSRMLS_D
+#define TSRMLS_DN	TSRMLS_D
 #define TSRMLS_C	tsrm_ls
 #define TSRMLS_CC	, TSRMLS_C
+#define TSRMLS_CN	TSRMLS_C
 
 #ifdef __cplusplus
 }
@@ -178,8 +180,10 @@ TSRM_API void tsrm_free_interpreter_context(void *context);
 #define TSRMLS_SET_CTX(ctx)
 #define TSRMLS_D	void
 #define TSRMLS_DC
+#define TSRMLS_DN	void ***tsrm_ls
 #define TSRMLS_C
 #define TSRMLS_CC
+#define TSRMLS_CN	NULL
 
 #endif /* ZTS */
 

Zend/acinclude.m4

@@ -9,7 +9,7 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
   # non-working versions, e.g. "3.0 3.2";
   # remove "none" when introducing the first incompatible bison version an 
   # separate any following additions by spaces
-  bison_version_exclude="3.0"
+  bison_version_exclude="none"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed

Zend/zend.c

@@ -863,7 +863,7 @@ void zend_set_utility_values(zend_utility_values *utility_values) /* {{{ */
 /* }}} */
 
 /* this should be compatible with the standard zenderror */
-void zenderror(const char *error) /* {{{ */
+void zenderror(TSRMLS_DN, const char *error) /* {{{ */
 {
 	zend_error(E_PARSE, "%s", error);
 }

Zend/zend.h

@@ -710,7 +710,7 @@ extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_le
 
 ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
 
-void zenderror(const char *error);
+void zenderror(TSRMLS_DN, const char *error);
 
 /* The following #define is used for code duality in PHP for Engine 1 & 2 */
 #define ZEND_STANDARD_CLASS_DEF_PTR zend_standard_class_def

Zend/zend_compile.c

@@ -6837,7 +6837,7 @@ ZEND_API void zend_activate_auto_globals(TSRMLS_D) /* {{{ */
 }
 /* }}} */
 
-int zendlex(znode *zendlval TSRMLS_DC) /* {{{ */
+int zendlex(znode *zendlval, TSRMLS_DN) /* {{{ */
 {
 	int retval;
 

Zend/zend_compile.h

@@ -730,7 +730,7 @@ ZEND_API zend_bool zend_is_auto_global(const char *name, uint name_len TSRMLS_DC
 ZEND_API zend_bool zend_is_auto_global_quick(const char *name, uint name_len, ulong hashval TSRMLS_DC);
 ZEND_API size_t zend_dirname(char *path, size_t len);
 
-int zendlex(znode *zendlval TSRMLS_DC);
+int zendlex(znode *zendlval, TSRMLS_DN);
 
 int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC);
 

Zend/zend_globals_macros.h

@@ -32,13 +32,13 @@ BEGIN_EXTERN_C()
 /* Compiler */
 #ifdef ZTS
 # define CG(v) TSRMG(compiler_globals_id, zend_compiler_globals *, v)
-int zendparse(void *compiler_globals);
 #else
 # define CG(v) (compiler_globals.v)
 extern ZEND_API struct _zend_compiler_globals compiler_globals;
-int zendparse(void);
 #endif
 
+int zendparse(void *compiler_globals);
+
 
 /* Executor */
 #ifdef ZTS

Zend/zend_ini_parser.y

@@ -29,16 +29,9 @@
 #include "zend_ini_scanner.h"
 #include "zend_extensions.h"
 
-#define YYERROR_VERBOSE
 #define YYSTYPE zval
 
-#ifdef ZTS
-#define YYPARSE_PARAM tsrm_ls
-#define YYLEX_PARAM tsrm_ls
 int ini_parse(void *arg);
-#else
-int ini_parse(void);
-#endif
 
 #define ZEND_INI_PARSER_CB	(CG(ini_parser_param))->ini_parser_cb
 #define ZEND_INI_PARSER_ARG	(CG(ini_parser_param))->arg
@@ -160,12 +153,11 @@ static void zend_ini_get_var(zval *result, zval *name TSRMLS_DC)
 
 /* {{{ ini_error()
 */
-static void ini_error(char *msg)
+static void ini_error(TSRMLS_DN, char *msg)
 {
 	char *error_buf;
 	int error_buf_len;
 	char *currently_parsed_filename;
-	TSRMLS_FETCH();
 
 	currently_parsed_filename = zend_ini_scanner_get_filename(TSRMLS_C);
 	if (currently_parsed_filename) {
@@ -206,7 +198,7 @@ ZEND_API int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_erro
 	}
 
 	CG(ini_parser_unbuffered_errors) = unbuffered_errors;
-	retval = ini_parse(TSRMLS_C);
+	retval = ini_parse(TSRMLS_CN);
 	zend_file_handle_dtor(fh TSRMLS_CC);
 
 	shutdown_ini_scanner(TSRMLS_C);
@@ -235,7 +227,7 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 	}
 
 	CG(ini_parser_unbuffered_errors) = unbuffered_errors;
-	retval = ini_parse(TSRMLS_C);
+	retval = ini_parse(TSRMLS_CN);
 
 	shutdown_ini_scanner(TSRMLS_C);
 
@@ -249,9 +241,14 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 
 %}
 
+%error-verbose
+
 %expect 0
 %pure_parser
 
+%parse-param { void *tsrm_ls }
+%lex-param { void *tsrm_ls }
+
 %token TC_SECTION
 %token TC_RAW
 %token TC_CONSTANT