[PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
Commit:975d26667bf7dbd0f4b739eca2e49d398105980a Author:Xinchen Hui Mon, 25 Mar 2013 23:48:21 +0800 Parents: c6e911e1549ba23158249ef1c0e6f27dcc6c88bb Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=975d26667bf7dbd0f4b739eca2e49d398105980a Log: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). Bugs: https://bugs.php.net/64503 Changed paths: M NEWS M Zend/zend_language_parser.y Diff: diff --git a/NEWS b/NEWS index 92e9c2b..09ce1d1 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 20??, PHP 5.5.0 Beta 2 - Core: + . Fixed bug #64503 (Compilation fails with error: conflicting types for +'zendparse'). (Laruence) . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11). (Dmitry, Laruence) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index ccbc9b1..6a9a24a 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); #define YYERROR_VERBOSE #define YYSTYPE znode -#ifdef ZTS -# define YYPARSE_PARAM tsrm_ls -# define YYLEX_PARAM tsrm_ls -#endif - %} %pure_parser %expect 3 +%code requires { +#ifdef ZTS +# define YYPARSE_PARAM tsrm_ls +# define YYLEX_PARAM tsrm_ls +#endif +} + %token END 0 "end of file" %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE %token T_INCLUDE "include (T_INCLUDE)" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
Hi, On Mon, 2013-03-25 at 15:48 +, Xinchen Hui wrote: > +%code requires { > +#ifdef ZTS > +# define YYPARSE_PARAM tsrm_ls > +# define YYLEX_PARAM tsrm_ls > +#endif > +} > + This doesn't seem to work with bison 2.3, either we have to increase the bison dependency or find another fix. Bison 2.3 is default with at least Solaris 11. $ bison --version bison (GNU Bison) 2.3 [...] $ ./config.nice [...] configure:5229: checking for bison version configure:5249: result: 2.3 (ok) [...] $ bison -y -p zend -v -d Zend/zend_language_parser.y -o Zend/zend_language_parser.c Zend/zend_language_parser.y:50.1-5: invalid directive: `%code' Zend/zend_language_parser.y:50.7-14: syntax error, unexpected identifier johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, Apr 3, 2013 at 4:56 PM, Johannes Schlüter wrote: > Hi, > > On Mon, 2013-03-25 at 15:48 +, Xinchen Hui wrote: > > +%code requires { > > +#ifdef ZTS > > +# define YYPARSE_PARAM tsrm_ls > > +# define YYLEX_PARAM tsrm_ls > > +#endif > > +} > > + > > This doesn't seem to work with bison 2.3, either we have to increase the > bison dependency or find another fix. Bison 2.3 is default with at least > Solaris 11. > > $ bison --version > bison (GNU Bison) 2.3 > [...] > $ ./config.nice > [...] > configure:5229: checking for bison version > configure:5249: result: 2.3 (ok) > [...] > $ bison -y -p zend -v -d Zend/zend_language_parser.y -o > Zend/zend_language_parser.c > Zend/zend_language_parser.y:50.1-5: invalid directive: `%code' > Zend/zend_language_parser.y:50.7-14: syntax error, unexpected identifier > Hey: yes, %code is introduced in bison 2.3+(it is said is 2.3a) . so, maybe we need to drop supports of 2.3 in 5.5 release, or revert this fix,, wait for somethings (like one year) thanks johannes -- Laruence Xinchen Hui http://www.laruence.com/
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, 2013-04-03 at 18:26 +0800, Laruence wrote: > > Hey: yes, %code is introduced in bison 2.3+(it is said is 2.3a) . > > so, maybe we need to drop supports of 2.3 in 5.5 release, or > revert this fix,, wait for somethings (like one year) > > thanks > Bison 2.4 is from November 2008. As this is needed by developers only I think it's absolutely fine to depend on 4 year old software. I haven't tested with 2.4. If somebody does/did we should modify the configure check. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, Apr 3, 2013 at 6:44 PM, Johannes Schlüter wrote: > On Wed, 2013-04-03 at 18:26 +0800, Laruence wrote: > > > > Hey: yes, %code is introduced in bison 2.3+(it is said is 2.3a) . > > > > so, maybe we need to drop supports of 2.3 in 5.5 release, or > > revert this fix,, wait for somethings (like one year) > > > > thanks > > > Bison 2.4 is from November 2008. As this is needed by developers only I > think it's absolutely fine to depend on 4 year old software. I haven't > tested with 2.4. If somebody does/did we should modify the configure > check. > Hey: remi did, see https://bugs.php.net/bug.php?id=64503 but seems start from 2.4.1 thanks > > johannes > > > -- Laruence Xinchen Hui http://www.laruence.com/
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
On Wed, 2013-04-03 at 19:04 +0800, Laruence wrote: > Hey: >remi did, see https://bugs.php.net/bug.php?id=64503 > >but seems start from 2.4.1 Then please update Zend/acinclude.m4: accordingly. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
Hey: I found another way, which will not break bison 2.3 support. that is, move the YYPARSE_PARAM definition into zend.h, or other header file which will always include before zend_language_parser.h and also include by zend_language_parse.c what do you think? thanks On Thu, Apr 4, 2013 at 9:24 PM, Johannes Schlüter wrote: > On Wed, 2013-04-03 at 19:04 +0800, Laruence wrote: > > Hey: > >remi did, see https://bugs.php.net/bug.php?id=64503 > > > >but seems start from 2.4.1 > > Then please update Zend/acinclude.m4: accordingly. > > johannes > > > -- Laruence Xinchen Hui http://www.laruence.com/
Re: [PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: NEWS Zend/zend_language_parser.y
Hey: the reason I am not sure about that is, the YYPARSE_PARAM is an bison specific macro, so it's a little weird if we define them in another header file... thanks On Fri, Apr 5, 2013 at 11:13 PM, Laruence wrote: > Hey: > I found another way, which will not break bison 2.3 support. > > that is, move the YYPARSE_PARAM definition into zend.h, or other > header file which will always include before zend_language_parser.h and > also include by zend_language_parse.c > > what do you think? > > thanks > > > On Thu, Apr 4, 2013 at 9:24 PM, Johannes Schlüter > wrote: > >> On Wed, 2013-04-03 at 19:04 +0800, Laruence wrote: >> > Hey: >> >remi did, see https://bugs.php.net/bug.php?id=64503 >> > >> >but seems start from 2.4.1 >> >> Then please update Zend/acinclude.m4: accordingly. >> >> johannes >> >> >> > > > -- > Laruence Xinchen Hui > http://www.laruence.com/ > -- Laruence Xinchen Hui http://www.laruence.com/