com php-src: Test use of string names with \ prefix: Zend/tests/varSyntax/indirectFcall.phpt Zend/tests/varSyntax/staticMember.phpt
Zend/zend_compile.c

Commit: 231dcc94e86c2e6b664b1310816cb6566518613b Author: Nikita Popov <nikic@php.net> Tue, 23 Sep 2014 20:35:32 +0200 Parents: 182ddfeaf200f5e4febce6b2c9ab8996f6df084a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=231dcc94e86c2e6b664b1310816cb6566518613b Log: Test use of string names with \ prefix And drop piece of dead code Changed paths: M Zend/tests/varSyntax/indirectFcall.phpt M Zend/tests/varSyntax/staticMember.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/varSyntax/indirectFcall.phpt b/Zend/tests/varSyntax/indirectFcall.phpt index 4cc5c11..5d616d5 100644 --- a/Zend/tests/varSyntax/indirectFcall.phpt +++ b/Zend/tests/varSyntax/indirectFcall.phpt @@ -34,6 +34,7 @@ $obj = new Test; ['Test', 'id']()()('var_dump')(11); 'id'()('id')('var_dump')(12); ('i' . 'd')()('var_dump')(13); +'\id'('var_dump')(14); ?> --EXPECT-- @@ -51,3 +52,4 @@ int(10) int(11) int(12) int(13) +int(14) diff --git a/Zend/tests/varSyntax/staticMember.phpt b/Zend/tests/varSyntax/staticMember.phpt index 22a1fa2..e324177 100644 --- a/Zend/tests/varSyntax/staticMember.phpt +++ b/Zend/tests/varSyntax/staticMember.phpt @@ -19,6 +19,7 @@ var_dump($A_str::$b); var_dump($A_obj::$b); var_dump(('A' . '')::$b); var_dump('A'::$b); +var_dump('\A'::$b); var_dump('A'[0]::$b); var_dump(A::$$b_str); var_dump(A::$$c_str[1]); @@ -33,5 +34,6 @@ int(0) int(0) int(0) int(0) +int(0) int(1) int(0) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4c51bb4..189d683 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1334,9 +1334,6 @@ again: if (LANG_SCNG(yy_text)[LANG_SCNG(yy_leng)-1] != '>') { CG(increment_lineno) = 1; } - if (CG(has_bracketed_namespaces) && !CG(in_namespace)) { - goto again; - } retval = ';'; /* implicit ; */ break; case T_OPEN_TAG_WITH_ECHO: