diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-25 20:07:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-26 13:03:55 +0200 |
| commit | d60e3c6ef53986e82178bb657ad907edc16d2c34 (patch) | |
| tree | 473211d0b04ac4eec07e2730277d31501b432a6d /Zend/zend_compile.h | |
| parent | bd70d155885fdc087afba912c1b290615b864e2f (diff) | |
| parent | 35951d4be0bd27c85519995a95429bd0d0a76a00 (diff) | |
| download | php-git-d60e3c6ef53986e82178bb657ad907edc16d2c34.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
Conflicts:
Zend/zend_language_parser.y
Zend/zend_vm_execute.skl
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 42f3ed405d..664f9b8469 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -727,6 +727,7 @@ int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC); #define ZEND_PARSED_VARIABLE (1<<4) #define ZEND_PARSED_REFERENCE_VARIABLE (1<<5) #define ZEND_PARSED_NEW (1<<6) +#define ZEND_PARSED_LIST_EXPR (1<<7) /* unset types */ |