diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-01 10:15:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-04-01 10:15:03 +0200 |
| commit | 9c0afc859c9c678e6aaaed85ace6d11a1a0a2c5b (patch) | |
| tree | d2cb1794ff7b3cf5dec3527a19152e0a62374a6f /Zend/zend_operators.h | |
| parent | f973b712b220c38c92ac5a87c7efef9afa12d3a9 (diff) | |
| download | php-git-9c0afc859c9c678e6aaaed85ace6d11a1a0a2c5b.tar.gz | |
Remove op_func from TRY_BINARY_OP1 macro
And move the operator overloading helpers into zend_operators.c,
there's no reason for them to be in the header.
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index cf6d6dd824..13f236bbaa 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -919,33 +919,6 @@ static zend_always_inline zend_bool fast_is_not_identical_function(zval *op1, zv return !zend_is_identical(op1, op2); } -#define ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(opcode, binary_op) \ - if (UNEXPECTED(Z_TYPE_P(op1) == IS_OBJECT) \ - && UNEXPECTED(Z_OBJ_HANDLER_P(op1, do_operation))) { \ - if (EXPECTED(SUCCESS == Z_OBJ_HANDLER_P(op1, do_operation)(opcode, result, op1, op2))) { \ - return SUCCESS; \ - } \ - } - -#define ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(opcode) \ - if (UNEXPECTED(Z_TYPE_P(op2) == IS_OBJECT) \ - && UNEXPECTED(Z_OBJ_HANDLER_P(op2, do_operation)) \ - && EXPECTED(SUCCESS == Z_OBJ_HANDLER_P(op2, do_operation)(opcode, result, op1, op2))) { \ - return SUCCESS; \ - } - -#define ZEND_TRY_BINARY_OBJECT_OPERATION(opcode, binary_op) \ - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(opcode, binary_op) \ - else \ - ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(opcode) - -#define ZEND_TRY_UNARY_OBJECT_OPERATION(opcode) \ - if (UNEXPECTED(Z_TYPE_P(op1) == IS_OBJECT) \ - && UNEXPECTED(Z_OBJ_HANDLER_P(op1, do_operation)) \ - && EXPECTED(SUCCESS == Z_OBJ_HANDLER_P(op1, do_operation)(opcode, result, op1, NULL))) { \ - return SUCCESS; \ - } - /* buf points to the END of the buffer */ static zend_always_inline char *zend_print_ulong_to_buf(char *buf, zend_ulong num) { *buf = '\0'; |