com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h
| From: | Stanislav Malyshev | Date: | Mon, 07 Jul 2014 05:15:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79254@lists.php.net to get a copy of this message | ||
Commit: c291033469920fa2155b3b1833731a0aa93257c3
Author: Stanislav Malyshev <stas@php.net> Sun, 6 Jul 2014 22:15:35 -0700
Parents: 2034ace0526657cbed0fafc3d77b1baa6604ae9e 716d2a3937b4590772212b563127810eb4aad672
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c291033469920fa2155b3b1833731a0aa93257c3
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Changed paths:
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.h
Diff:
diff --cc Zend/zend_vm_opcodes.h
index 911eee4,5e4bf4d..4ed726d
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -164,10 -164,5 +164,10 @@@ ZEND_API const char *zend_get_opcode_na
#define ZEND_SEPARATE 156
#define ZEND_QM_ASSIGN_VAR 157
#define ZEND_JMP_SET_VAR 158
+#define ZEND_DISCARD_EXCEPTION 159
+#define ZEND_YIELD 160
+#define ZEND_GENERATOR_RETURN 161
+#define ZEND_FAST_CALL 162
+#define ZEND_FAST_RET 163
- #endif
+ #endif