diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-10 23:24:11 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-10 23:24:11 +0300 |
| commit | e087d3ac7f78a2bfea01ce7c94e18b4c89073003 (patch) | |
| tree | e5b1f6f1beb6098ff245385f8737de9bc1690f14 /Zend/zend_language_parser.y | |
| parent | ba35b22bc4a7af791ff2ab7c2ca8e9f4aa6d64df (diff) | |
| parent | 92a9477cc399c78f6570beec22b8f1408179aefe (diff) | |
| download | php-git-e087d3ac7f78a2bfea01ce7c94e18b4c89073003.tar.gz | |
Merge branch 'master' into native-tls
* master: (23 commits)
move the test to the right place
fix TS build and C89 compat
updated NEWS
Fixed bug #68545 NULL pointer dereference in unserialize.c
Updated NEWS
Updated NEWS
Updated NEWS
NEWS
Fix bug #68526 Implement POSIX Access Control List for UDS
Improved basic zval copying primitives: ZVAL_COPY_VALUE(), ZVAL_COPY(), ZVAL_DUP()
Wrap RETURN_VALUE_USED() with EXPECTED() or UNEXPECTED() macros according to more frequent usage patterns.
Improved ASSIGN_<OP>, ASSIGN_DIM and UNSET_DIM
drop dead/unused code
simplified code
Move ZVAL_DEREF() and make_real_object() into slow paths.
Pass znode_op structure by value (it fits into one word) instead of pointer to structure.
Move checks for references into slow paths.
Improved ASSIGN_DIM and ASSIGN_OBJ
Fixed typo
Move checks for references into slow paths of handlers or helpers. Remove duplicate opcode handlers.
...
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index b133fdfeea..11c9827d5b 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -66,6 +66,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %left T_LOGICAL_AND %right T_PRINT %right T_YIELD +%right T_DOUBLE_ARROW %left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL T_POW_EQUAL %left '?' ':' %right T_COALESCE @@ -89,7 +90,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %left T_ELSE %left T_ENDIF %right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC -%right T_DOUBLE_ARROW %token <ast> T_LNUMBER "integer number (T_LNUMBER)" %token <ast> T_DNUMBER "floating-point number (T_DNUMBER)" |