diff options
| author | Zeev Suraski <zeev@php.net> | 2003-04-10 04:43:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-04-10 04:43:42 +0000 |
| commit | 65f06d8027d4285de727b50c80fef46db0067679 (patch) | |
| tree | 11bfe65cffafb2b8a22dc414c4e9ae65b7a73a67 | |
| parent | 8a9ff734a0ce5bbb609ce115a6898d7b767a8c58 (diff) | |
| download | php-git-65f06d8027d4285de727b50c80fef46db0067679.tar.gz | |
Revert Harald's commit
| -rw-r--r-- | Zend/zend_language_parser.y | 5 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.l | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 331015076f..bdc0008488 100644 --- 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 9d3c76795d..1aa2110de6 100644 --- 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; |