diff options
| author | Harald Radi <phanto@php.net> | 2003-04-09 20:23:06 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2003-04-09 20:23:06 +0000 |
| commit | 07e775bcde588b767720a0b3c9b37b7721ca2e23 (patch) | |
| tree | 326c2086c4d8dcf166d62a5cefa04c7f7bf21f25 | |
| parent | 1cdd29eeef54725cf6f719e92253042a5db2c3f4 (diff) | |
| download | php-git-07e775bcde588b767720a0b3c9b37b7721ca2e23.tar.gz | |
removing the *syntactical sugar* again
# commiting that on behalf of the community :)
# don't blame me, i'm just acting as a proxy
| -rw-r--r-- | Zend/zend_language_parser.y | 4 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.l | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index bdc0008488..accb9641bb 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -142,7 +142,6 @@ %token T_CURLY_OPEN %token T_PAAMAYIM_NEKUDOTAYIM %token T_IMPORT T_FROM -%token T_NAMESPACE_NAME %token T_NAMESPACE %% /* Rules */ @@ -654,8 +653,7 @@ fully_qualified_class_name: ; import_namespace: - T_NAMESPACE_NAME { zend_do_fetch_class(&$$, NULL, &$1, 0 TSRMLS_CC); } - | T_STRING { 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 1aa2110de6..9d3c76795d 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -483,7 +483,6 @@ ENCAPSED_TOKENS [\[\]{}$] ESCAPED_AND_WHITESPACE [\n\t\r #'.:;,()|^&+-/*=%!~<>?@]+ ANY_CHAR (.|[\n]) NEWLINE ("\r"|"\n"|"\r\n") -NAMESPACE_NAME ({LABEL}":")+{LABEL} %option noyylineno %option noyywrap @@ -1130,13 +1129,6 @@ NAMESPACE_NAME ({LABEL}":")+{LABEL} 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; |