mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert Harald's commit

Browse Source
This commit is contained in:
Zeev Suraski 2003-04-10 04:43:42 +00:00
parent 8a9ff734a0
commit 65f06d8027
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_language_parser.y
View File

@ -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:

8
Zend/zend_language_scanner.l
View File

@ -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;