From 4f522eb576de796c8a78bad2324b5d192561ac9d Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Jun 2008 09:38:47 +0000
Subject: [PATCH] allow aggregating use statements

---
 Zend/tests/ns_065.inc       |  9 +++++++++
 Zend/tests/ns_065.phpt      | 13 +++++++++++++
 Zend/zend_language_parser.y | 16 ++++++++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100755 Zend/tests/ns_065.inc
 create mode 100755 Zend/tests/ns_065.phpt

diff --git a/Zend/tests/ns_065.inc b/Zend/tests/ns_065.inc
new file mode 100755
index 00000000000..a625a4a1b4c
--- /dev/null
+++ b/Zend/tests/ns_065.inc
@@ -0,0 +1,9 @@
+<?php
+namespace X::Y;
+function foo() {
+	echo __FUNCTION__."\n";
+}
+namespace X::Z;
+function foo() {
+	echo __FUNCTION__."\n";
+}
diff --git a/Zend/tests/ns_065.phpt b/Zend/tests/ns_065.phpt
new file mode 100755
index 00000000000..8d7e7fbb1a5
--- /dev/null
+++ b/Zend/tests/ns_065.phpt
@@ -0,0 +1,13 @@
+--TEST--
+065: Multiple names in use statement
+--FILE--
+<?php
+use X::Y as test, X::Z as test2;
+
+require "ns_065.inc";
+
+test::foo();
+test2::foo();
+--EXPECT--
+X::Y::foo
+X::Z::foo
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index fbe941937cb..1fc365cfb7c 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -172,13 +172,21 @@ top_statement:
 	|	class_declaration_statement		{ zend_do_early_binding(TSRMLS_C); }
 	|	T_HALT_COMPILER '(' ')' ';'		{ zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
 	|	T_NAMESPACE namespace_name ';'	{ zend_do_namespace(&$2 TSRMLS_CC); }
-	|	T_USE namespace_name ';'		{ zend_do_use(&$2, NULL, 0 TSRMLS_CC); }
-	|	T_USE namespace_name T_AS T_STRING ';'	{ zend_do_use(&$2, &$4, 0 TSRMLS_CC); }
-	|	T_USE T_PAAMAYIM_NEKUDOTAYIM T_STRING ';'		{ zend_do_use(&$3, NULL, 1 TSRMLS_CC); }
-	|	T_USE T_PAAMAYIM_NEKUDOTAYIM T_STRING T_AS T_STRING ';'		{ zend_do_use(&$3, &$5, 1 TSRMLS_CC); }
+	|	T_USE use_declarations ';'
 	|	constant_declaration ';'
 ;
 
+use_declarations:
+		use_declarations ',' use_declaration
+	|	use_declaration
+
+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_PAAMAYIM_NEKUDOTAYIM T_STRING { zend_do_use(&$2, NULL, 1 TSRMLS_CC); }
+	|	T_PAAMAYIM_NEKUDOTAYIM T_STRING T_AS T_STRING { zend_do_use(&$2, &$4, 1 TSRMLS_CC); }
+
+
 constant_declaration:
 		constant_declaration ',' T_STRING '=' static_scalar	{ zend_do_declare_constant(&$3, &$5 TSRMLS_CC); }
 	|	T_CONST T_STRING '=' static_scalar { zend_do_declare_constant(&$2, &$4 TSRMLS_CC); }