diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-28 00:07:04 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-28 00:07:04 +0100 |
| commit | 2d069f640e6cccfa3ba8b1e4f375ade20fb33f64 (patch) | |
| tree | e6edf9822fe559eae0506c75c83286d404c822be /Zend/zend_vm_opcodes.c | |
| parent | f13da5b0d72dc8dfcc5e7d4ae11556a92c36ce53 (diff) | |
| parent | ec39802e4e7dac14b629f41017d04573a6a5fdc4 (diff) | |
| download | php-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_vm_opcodes.c')
| -rw-r--r-- | Zend/zend_vm_opcodes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c index d02b7479a6..23b49e3d71 100644 --- a/Zend/zend_vm_opcodes.c +++ b/Zend/zend_vm_opcodes.c @@ -21,7 +21,7 @@ #include <stdio.h> #include <zend.h> -const char *zend_vm_opcodes_map[169] = { +const char *zend_vm_opcodes_map[170] = { "ZEND_NOP", "ZEND_ADD", "ZEND_SUB", @@ -191,6 +191,7 @@ const char *zend_vm_opcodes_map[169] = { "ZEND_POW", "ZEND_ASSIGN_POW", "ZEND_BIND_GLOBAL", + "ZEND_COALESCE", }; ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) { |