Test use of string names with \ prefix

And drop piece of dead code

diff --git a/Zend/tests/varSyntax/indirectFcall.phpt b/Zend/tests/varSyntax/indirectFcall.phpt
index 4cc5c1171a99369455dc3f730ed2ef278bd7ebc2..5d616d59a246a5f39e34641d57939ec77b444c4d 100644 (file)
--- 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 22a1fa2b132150a85c1f08d881b3ad41f0f8f52c..e32417771a7a316c659341e59c1fa62e6a3ebaf1 100644 (file)
--- 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 4c51bb4b989ba37bac3ff0c0c258b7eacfe4d47f..189d68344659c541af936762f23581a86f781cc9 100644 (file)
--- 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: