stas Mon Nov 17 18:00:44 2008 UTC
Added files: (Branch: PHP_5_3)
/ZendEngine2/tests ns_078.phpt
Modified files:
/ZendEngine2 zend_language_parser.y
Log:
Improve use syntax
[DOC] use \foo\bar is the same as use foo\bar
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.160.2.4.2.8.2.30&r2=1.160.2.4.2.8.2.31&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.30
ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.31
--- ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.30 Tue Nov 11
19:45:26 2008
+++ ZendEngine2/zend_language_parser.y Mon Nov 17 18:00:43 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.30 2008/11/11 19:45:26 stas
Exp $ */
+/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.31 2008/11/17 18:00:43 stas
Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -183,8 +183,8 @@
use_declaration:
namespace_name { zend_do_use(&$1, NULL, 0
TSRMLS_CC); }
| namespace_name T_AS T_STRING { zend_do_use(&$1, &$3, 0
TSRMLS_CC); }
- | T_NS_SEPARATOR T_STRING { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
- | T_NS_SEPARATOR T_STRING T_AS T_STRING { zend_do_use(&$2, &$4, 1
TSRMLS_CC); }
+ | T_NS_SEPARATOR namespace_name { zend_do_use(&$2, NULL, 1
TSRMLS_CC); }
+ | T_NS_SEPARATOR namespace_name T_AS T_STRING { zend_do_use(&$2,
&$4, 1 TSRMLS_CC); }
;
constant_declaration:
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/ns_078.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/ns_078.phpt
+++ ZendEngine2/tests/ns_078.phpt
