summaryrefslogtreecommitdiff
path: root/Zend/zend_ast.h
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2014-09-28 00:07:04 +0100
committerAndrea Faulds <ajf@ajf.me>2014-09-28 00:07:04 +0100
commit2d069f640e6cccfa3ba8b1e4f375ade20fb33f64 (patch)
treee6edf9822fe559eae0506c75c83286d404c822be /Zend/zend_ast.h
parentf13da5b0d72dc8dfcc5e7d4ae11556a92c36ce53 (diff)
parentec39802e4e7dac14b629f41017d04573a6a5fdc4 (diff)
downloadphp-git-2d069f640e6cccfa3ba8b1e4f375ade20fb33f64.tar.gz
Merge branch 'coalesce_operator'
* coalesce_operator: Extended coalesce operator test case for ordering/short-circuiting Ensure not evaluated twice Added test Initial coalesce operator implementation
Diffstat (limited to 'Zend/zend_ast.h')
-rw-r--r--Zend/zend_ast.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index db7b623d9f..6bd6850d83 100644
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -115,6 +115,7 @@ enum _zend_ast_kind {
ZEND_AST_NEW,
ZEND_AST_INSTANCEOF,
ZEND_AST_YIELD,
+ ZEND_AST_COALESCE,
ZEND_AST_STATIC,
ZEND_AST_WHILE,