- 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

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 2160eefc1dcb945a56e20736c11a641df1ced76f..a4dd357a01c2002dc0a6c186e1346414327b156e 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -495,8 +495,8 @@ class_variable_declaration:
 ;
 
 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: