]> granicus.if.org Git - php/commitdiff
Merge branch 'coalesce_operator'
authorAndrea Faulds <ajf@ajf.me>
Sat, 27 Sep 2014 23:07:04 +0000 (00:07 +0100)
committerAndrea Faulds <ajf@ajf.me>
Sat, 27 Sep 2014 23:07:04 +0000 (00:07 +0100)
* coalesce_operator:
  Extended coalesce operator test case for ordering/short-circuiting
  Ensure not evaluated twice
  Added test
  Initial coalesce operator implementation

1  2 
Zend/zend_ast.h
Zend/zend_compile.c
Zend/zend_opcode.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_opcodes.c
Zend/zend_vm_opcodes.h

diff --cc Zend/zend_ast.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge