diff options
| author | foobar <sniper@php.net> | 2003-04-25 10:13:51 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-04-25 10:13:51 +0000 |
| commit | c0cde196d7686eee196f7098c14a729a2ee342c4 (patch) | |
| tree | 2bc404e0f1f4e967476c94ed3b030bca399459c3 | |
| parent | 6bfa5b405fb800da9b9de176c3a9cab35460bbc1 (diff) | |
| download | php-git-c0cde196d7686eee196f7098c14a729a2ee342c4.tar.gz | |
Fixed bug #21820 ("$arr[foo]" generates bogus E_NOTICE, should be E_PARSE)
| -rw-r--r-- | Zend/zend_language_scanner.l | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 1aa2110de6..ee1060cb55 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -474,8 +474,6 @@ DNUM ([0-9]*[\.][0-9]+)|([0-9]+[\.][0-9]*) EXPONENT_DNUM (({LNUM}|{DNUM})[eE][+-]?{LNUM}) HNUM "0x"[0-9a-fA-F]+ LABEL [a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]* -ENCAPSED_STRING ([a-zA-Z0-9_\x7f-\xff \t #'.:;,()|^&+/*=%!~<>?@]|"-"[a-zA-Z0-9_\x7f-\xff \t #'.:;,()|^&+/*=%!~<?@])+ -ENCAPSED_STRING_WITH_NEWLINE ([a-zA-Z0-9_\x7f-\xff \t\n\r #'.:;,()|^&+/*=%!~<>?@]|"-"[a-zA-Z0-9_\x7f-\xff \t\n\r #'.:;,()|^&+/*=%!~<?@])+ WHITESPACE [ \n\r\t]+ TABS_AND_SPACES [ \t]* TOKENS [;:,.\[\]()|^&+-/*=%!~$<>?@] @@ -1115,14 +1113,6 @@ NAMESPACE_NAME ({LABEL}":")+{LABEL} return T_VARIABLE; } -<ST_DOUBLE_QUOTES,ST_BACKQUOTE>{ENCAPSED_STRING_WITH_NEWLINE} { - HANDLE_NEWLINES(yytext, yyleng); - zendlval->value.str.val = (char *)estrndup(yytext, yyleng); - zendlval->value.str.len = yyleng; - zendlval->type = IS_STRING; - return T_STRING; -} - <ST_IN_SCRIPTING>{LABEL} { zendlval->value.str.val = (char *)estrndup(yytext, yyleng); zendlval->value.str.len = yyleng; @@ -1137,7 +1127,7 @@ NAMESPACE_NAME ({LABEL}":")+{LABEL} return T_NAMESPACE_NAME; } -<ST_HEREDOC>{ENCAPSED_STRING} { +<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>{LABEL} { zendlval->value.str.val = (char *)estrndup(yytext, yyleng); zendlval->value.str.len = yyleng; zendlval->type = IS_STRING; |