diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-03-14 01:08:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-03-14 01:08:03 +0300 |
| commit | d1585a9e3f7c6e3da7177f07c68b250543d8fbf2 (patch) | |
| tree | 8eed5fe2058e82b66cb3447f12fd119a1117f123 /Zend/zend_language_parser.y | |
| parent | 0d6da03f5c3e49b92cf6817ba8a7f8d6f60ee1aa (diff) | |
| download | php-git-d1585a9e3f7c6e3da7177f07c68b250543d8fbf2.tar.gz | |
Revert "Handle scanner error in first place (don't hide them from ext/tokenizer) and cheaper whitespace handlig."
This reverts commit 0d6da03f5c3e49b92cf6817ba8a7f8d6f60ee1aa.
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 017e84a9e4..2941546e06 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -203,6 +203,12 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_TRAIT_C "__TRAIT__ (T_TRAIT_C)" %token T_METHOD_C "__METHOD__ (T_METHOD_C)" %token T_FUNC_C "__FUNCTION__ (T_FUNC_C)" +%token T_COMMENT "comment (T_COMMENT)" +%token T_DOC_COMMENT "doc comment (T_DOC_COMMENT)" +%token T_OPEN_TAG "open tag (T_OPEN_TAG)" +%token T_OPEN_TAG_WITH_ECHO "open tag with echo (T_OPEN_TAG_WITH_ECHO)" +%token T_CLOSE_TAG "close tag (T_CLOSE_TAG)" +%token T_WHITESPACE "whitespace (T_WHITESPACE)" %token T_START_HEREDOC "heredoc start (T_START_HEREDOC)" %token T_END_HEREDOC "heredoc end (T_END_HEREDOC)" %token T_DOLLAR_OPEN_CURLY_BRACES "${ (T_DOLLAR_OPEN_CURLY_BRACES)" @@ -216,14 +222,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %token T_POW "** (T_POW)" %token T_POW_EQUAL "**= (T_POW_EQUAL)" -/* Special tokens (ignorred by PHP compiler, T_WHITESPACE must be first) */ -%token T_WHITESPACE "whitespace (T_WHITESPACE)" -%token T_COMMENT "comment (T_COMMENT)" -%token T_DOC_COMMENT "doc comment (T_DOC_COMMENT)" -%token T_OPEN_TAG "open tag (T_OPEN_TAG)" -%token T_OPEN_TAG_WITH_ECHO "open tag with echo (T_OPEN_TAG_WITH_ECHO)" -%token T_CLOSE_TAG "close tag (T_CLOSE_TAG)" - /* Token used to force a parse error from the lexer */ %token T_ERROR |