diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-05-25 19:00:08 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-05-25 19:00:08 +0200 |
| commit | 21ccdf6304c40201fb749181cf4701f8fa422fbf (patch) | |
| tree | dbdf9d24590a1912be97d2a26cd224124669ac18 /Zend/zend_language_parser.y | |
| parent | 886cbea94f7f823f5b7afbbafe023a9068f069e5 (diff) | |
| download | php-git-21ccdf6304c40201fb749181cf4701f8fa422fbf.tar.gz | |
Rebuild scanner, add NEWS/UPGRADING
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index f6318ec0c0..b49f736636 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -52,7 +52,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %} %pure_parser -%expect 2 +%expect 8 /* 6 because traits */ %code requires { } @@ -278,8 +278,8 @@ semi_reserved: | T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO | T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK | T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE - // | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC - // | T_CLASS + | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC +// | T_CLASS ; identifier: |