cvs: ZendEngine2 / zend_language_parser.y
[email protected] ("Dmitry Stogov")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsdmitry1202806807@cvsserver> |
dmitry Tue Feb 12 09:00:07 2008 UTC
Modified files:
/ZendEngine2 zend_language_parser.y
Log:
Fixed comilation warnings
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.201&r2=1.202&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.201 ZendEngine2/zend_language_parser.y:1.202
--- ZendEngine2/zend_language_parser.y:1.201 Tue Feb 12 08:49:19 2008
+++ ZendEngine2/zend_language_parser.y Tue Feb 12 09:00:07 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.201 2008/02/12 08:49:19 dmitry Exp $ */
+/* $Id: zend_language_parser.y,v 1.202 2008/02/12 09:00:07 dmitry Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -786,13 +786,11 @@
w_variable:
- variable { zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); $$ = $1; }
- { zend_check_writable_variable(&$1); }
+ variable { zend_do_end_variable_parse(BP_VAR_W, 0 TSRMLS_CC); $$ = $1; zend_check_writable_variable(&$1); }
;
rw_variable:
- variable { zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); $$ = $1; }
- { zend_check_writable_variable(&$1); }
+ variable { zend_do_end_variable_parse(BP_VAR_RW, 0 TSRMLS_CC); $$ = $1; zend_check_writable_variable(&$1); }
;
variable:
@@ -867,7 +865,7 @@
object_property:
object_dim_list { $$ = $1; }
- | variable_without_objects { zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); } { znode tmp_znode; zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);}
+ | variable_without_objects { znode tmp_znode; zend_do_end_variable_parse(BP_VAR_R, 0 TSRMLS_CC); zend_do_pop_object(&tmp_znode TSRMLS_CC); zend_do_fetch_property(&$$, &tmp_znode, &$1 TSRMLS_CC);}
;
object_dim_list: