com php-src: require trailing T_NS_SEPARATOR #100 5: Zend/tests/ns_088.phpt Zend/tests/ns_0 89.phpt Zend/tests/ns_090.phpt Zend/tests/n s_091.phpt
Zend/tests/ns_092.phpt Zend/ zend_language_parser.y

From: Date: Sat, 07 Mar 2015 20:59:48 +0000
Subject: com php-src: require trailing T_NS_SEPARATOR #100 5: Zend/tests/ns_088.phpt Zend/tests/ns_0 89.phpt Zend/tests/ns_090.phpt Zend/tests/n s_091.phpt
Zend/tests/ns_092.phpt Zend/ zend_language_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85318@lists.php.net to get a copy of this message
Commit: 344fc25b1267d7232ea1c30ea5fabf4788b2aed2 Author: Márcio Almada <marcio3w@gmail.com> Fri, 30 Jan 2015 19:54:37 -0300 Parents: 52b20b0b46a1d44ebd769855128c6b884abf6136 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=344fc25b1267d7232ea1c30ea5fabf4788b2aed2 Log: require trailing T_NS_SEPARATOR #1005 Bugs: https://bugs.php.net/1005 Changed paths: M Zend/tests/ns_088.phpt M Zend/tests/ns_089.phpt M Zend/tests/ns_090..phpt M Zend/tests/ns_091.phpt M Zend/tests/ns_092.phpt M Zend/zend_language_parser.y Diff: diff --git a/Zend/tests/ns_088.phpt b/Zend/tests/ns_088.phpt index adcc616..484fae3 100644 --- a/Zend/tests/ns_088.phpt +++ b/Zend/tests/ns_088.phpt @@ -3,7 +3,7 @@ Nested batch use statements syntax error --FILE-- <?php namespace Fiz\Biz\Buz { - use Foo\Bar\Baz { + use Foo\Bar\Baz\{ A, B { C diff --git a/Zend/tests/ns_089.phpt b/Zend/tests/ns_089.phpt index 5209417..81c4c02 100644 --- a/Zend/tests/ns_089.phpt +++ b/Zend/tests/ns_089.phpt @@ -14,7 +14,7 @@ namespace Foo\Bar\Baz { } namespace Fiz\Biz\Buz { - use Foo\Bar\Baz { + use Foo\Bar\Baz\{ A, B, C as AC, diff --git a/Zend/tests/ns_090.phpt b/Zend/tests/ns_090.phpt index bf460d0..73c8595 100644 --- a/Zend/tests/ns_090.phpt +++ b/Zend/tests/ns_090.phpt @@ -14,8 +14,8 @@ namespace Foo\Bar\Baz { } namespace Fiz\Biz\Buz { - use Foo\Bar\Baz { A, B, C as AC, D }; - use Foo\Bar\Baz { function foo, function bar as buz, const FOO, const BAR AS BOZ }; + use Foo\Bar\Baz\{ A, B, C as AC, D }; + use Foo\Bar\Baz\{ function foo, function bar as buz, const FOO, const BAR AS BOZ }; class C { function __construct() {echo __METHOD__,"\n";}} function bar(){echo __FUNCTION__,"\n";} diff --git a/Zend/tests/ns_091.phpt b/Zend/tests/ns_091.phpt index 2338e88..8d93dd7 100644 --- a/Zend/tests/ns_091.phpt +++ b/Zend/tests/ns_091.phpt @@ -10,7 +10,7 @@ namespace Foo\Bar\Baz { } namespace Fiz\Biz\Buz { - use Foo\Bar { A, Baz\B }; + use Foo\Bar\{ A, Baz\B }; new A; new B; } diff --git a/Zend/tests/ns_092.phpt b/Zend/tests/ns_092.phpt index aff8c97..c69ada9 100644 --- a/Zend/tests/ns_092.phpt +++ b/Zend/tests/ns_092.phpt @@ -13,20 +13,20 @@ namespace Foo\Bar { } namespace Fiz\Biz\Buz { - use function Foo\Bar { + use function Foo\Bar\{ fiz, biz, buz as boz, A // <- this one must fail }; - use const Foo\Bar { + use const Foo\Bar\{ FOO as FOZ, BAR, B // <- this one must fail }; - use Foo\Bar { A, B, const BAR as BOZ }; + use Foo\Bar\{ A, B, const BAR as BOZ }; function buz(){ echo __FUNCTION__,"\n"; } const FOO = 100; diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 88d9e2f..a9a93b8 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -308,13 +308,13 @@ top_statement: ; batch_use_declarations: - namespace_name '{' use_declarations '}' - {$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $3); } + namespace_name T_NS_SEPARATOR '{' use_declarations '}' + {$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4); } ; mixed_batch_use_declarations: - namespace_name '{' inline_use_declarations '}' - {$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $3);} + namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}' + {$$ = zend_ast_create(ZEND_AST_BATCH_USE, $1, $4);} ; inline_use_declarations:

« previous php.cvs (#85318) next »