Revert Harald's commit

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 331015076f8f74d7f7c58fd80f405f749b167823..bdc00084880f500a8502cc55d735d6aeab142322 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -142,8 +142,8 @@
 %token T_CURLY_OPEN
 %token T_PAAMAYIM_NEKUDOTAYIM
 %token T_IMPORT T_FROM
-%token T_NAMESPACE
 %token T_NAMESPACE_NAME
+%token T_NAMESPACE
 
 %% /* Rules */
 
@@ -654,7 +654,8 @@ fully_qualified_class_name:
 ;
 
 import_namespace:
-               T_STRING { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
+               T_NAMESPACE_NAME { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
+       |       T_STRING { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); }
 ;
 
 dynamic_class_name:

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 9d3c76795d8c335172b309ac1eb263c0e2eb9ffc..1aa2110de6705a7bf7fab494db6ac3b063c95239 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -483,6 +483,7 @@ ENCAPSED_TOKENS [\[\]{}$]
 ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+
 ANY_CHAR (.|[\n])
 NEWLINE ("\r"|"\n"|"\r\n")
+NAMESPACE_NAME ({LABEL}":")+{LABEL}
 
 %option noyylineno
 %option noyywrap
@@ -1129,6 +1130,13 @@ NEWLINE ("\r"|"\n"|"\r\n")
        return T_STRING;
 }
 
+<ST_IN_SCRIPTING>{NAMESPACE_NAME} {
+       zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
+       zendlval->value.str.len = yyleng;
+       zendlval->type = IS_STRING;
+       return T_NAMESPACE_NAME;
+}
+
 <ST_HEREDOC>{ENCAPSED_STRING} {
        zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
        zendlval->value.str.len = yyleng;