Re: Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2(PHP_5_2) / zend_language_parser.y

Then this needs to be clear in the NEWS file as this is in RC1... -Hannes On 8/14/07, Ilia Alshanetsky <ilia@prohost.org> wrote: > Jani, > > Dmitry asked that the patch be reverted and I agreed with him. Since > the author didn't have time (I am guessing), I've asked Stas to > revert the patch. The reason being that this change is too major to > commit at the very last minute in the release cycle. The code will go > back into CVS, once 5.2.4 is released. > > > On 13-Aug-07, at 5:41 PM, Jani Taskinen wrote: > > > Was there something wrong with the patch or what? > > Reverting without _discussing_ is not very nice.. > > > > --Jani > > > > Stanislav Malyshev kirjoitti: > >> stas Mon Aug 13 21:16:57 2007 UTC > >> Modified files: (Branch: PHP_5_2) > >> /ZendEngine2 zend_language_parser.y Log: > >> Revert variable class patch for 5.2 > >> http://cvs.php.net/viewvc.cgi/ZendEngine2/ > >> zend_language_parser.y? > >> r1=1.160.2.4.2.7&r2=1.160.2.4.2.8&diff_format=u > >> Index: ZendEngine2/zend_language_parser.y > >> diff -u ZendEngine2/zend_language_parser.y:1.160.2.4.2.7 > >> ZendEngine2/zend_language_parser.y:1.160.2.4.2.8 > >> --- ZendEngine2/zend_language_parser.y:1.160.2.4.2.7 Thu Aug 2 > >> 21:55:23 2007 > >> +++ ZendEngine2/zend_language_parser.y Mon Aug 13 21:16:57 2007 > >> @@ -18,7 +18,7 @@ > >> > >> +-------------------------------------------------------------------- > >> --+ > >> */ > >> -/* $Id: zend_language_parser.y,v 1.160.2.4.2.7 2007/08/02 > >> 21:55:23 johannes Exp $ */ > >> +/* $Id: zend_language_parser.y,v 1.160.2.4.2.8 2007/08/13 > >> 21:16:57 stas Exp $ */ > >> /* > >> * LALR shift/reduce conflicts and how they are resolved: > >> @@ -630,12 +630,6 @@ > >> | fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM > >> variable_without_objects '(' { zend_do_end_variable_parse > >> (BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(& > >> $1, &$3 TSRMLS_CC); } > >> function_call_parameter_list > >> ')' { zend_do_end_function_call(NULL, &$$, &$6, > >> 1, 1 > >> TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} > >> - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING > >> '(' { zend_do_begin_class_member_function_call(&$1, &$3 TSRMLS_CC); > >> } > >> - function_call_parameter_list > >> - ')' { zend_do_end_function_call(NULL, &$$, &$6, > >> 1, 1 > >> TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} > >> - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM > >> variable_without_objects '(' { zend_do_end_variable_parse > >> (BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_class_member_function_call(& > >> $1, &$3 TSRMLS_CC); } > >> - function_call_parameter_list > >> - ')' { zend_do_end_function_call(NULL, &$$, &$6, > >> 1, 1 > >> TSRMLS_CC); zend_do_extended_fcall_end(TSRMLS_C);} > >> | variable_without_objects '(' { zend_do_end_variable_parse > >> (BP_VAR_R, 0 TSRMLS_CC); zend_do_begin_dynamic_function_call(&$1 > >> TSRMLS_CC); } > >> function_call_parameter_list ')' > >> { zend_do_end_function_call(&$1, &$$, &$4, 0, 1 > >> TSRMLS_CC); > >> zend_do_extended_fcall_end(TSRMLS_C);} > >> @@ -787,13 +781,8 @@ > >> static_member: > >> fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM > >> variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$ > >> $, &$1 TSRMLS_CC); } > >> - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM > >> variable_without_objects { $$ = $3; zend_do_fetch_static_member(&$ > >> $, &$1 TSRMLS_CC); } > >> - > >> ; > >> -variable_class_name: > >> - reference_variable { zend_do_end_variable_parse(BP_VAR_R, 0 > >> TSRMLS_CC); zend_do_fetch_class(&$$, &$1 TSRMLS_CC); } > >> -; > >> base_variable_with_function_calls: > >> base_variable { $$ = $1; } > >> @@ -918,7 +907,6 @@ > >> class_constant: > >> fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING > >> { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT TSRMLS_CC); } > >> - | variable_class_name T_PAAMAYIM_NEKUDOTAYIM T_STRING > >> { zend_do_fetch_constant(&$$, &$1, &$3, ZEND_RT TSRMLS_CC); } > >> ; > >> %% > > > > -- > > PHP Internals - PHP Runtime Development Mailing List > > To unsubscribe, visit: http://www.php.net/unsub.php > > > > Ilia Alshanetsky > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > >