cvs: ZendEngine2 / zend_language_parser.y

andi Tue Oct 28 18:44:23 2003 EDT Modified files: /ZendEngine2 zend_language_parser.y Log: - Head up! I'm reverting the patch which allows for expressions in constant - declerations. Allowing the access of other constants in this code is - flawed. We are reverting back to PHP 4's static scalars. - Don't worry if you get the following msg when compiling: - "zend_language_parser.y contains 3 useless nonterminals and 22 useless rules" - I didn't nuke the code in case we have some brilliant ideas after beta 2 Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.127 ZendEngine2/zend_language_parser.y:1.128 --- ZendEngine2/zend_language_parser.y:1.127 Sun Oct 19 04:38:48 2003 +++ ZendEngine2/zend_language_parser.y Tue Oct 28 18:44:23 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_parser.y,v 1.127 2003/10/19 08:38:48 andi Exp $ */ +/* $Id: zend_language_parser.y,v 1.128 2003/10/28 23:44:23 andi Exp $ */ /* * LALR shift/reduce conflicts and how they are resolved: @@ -495,8 +495,8 @@ ; class_constant_declaration: - class_constant_declaration ',' T_STRING '=' const_scalar_expr { zend_do_declare_class_constant(&$3, &$5 TSRMLS_CC); } - | T_CONST T_STRING '=' const_scalar_expr { zend_do_declare_class_constant(&$2, &$4 TSRMLS_CC); } + class_constant_declaration ',' T_STRING '=' static_scalar { zend_do_declare_class_constant(&$3, &$5 TSRMLS_CC); } + | T_CONST T_STRING '=' static_scalar { zend_do_declare_class_constant(&$2, &$4 TSRMLS_CC); } ; echo_expr_list: