diff options
| author | Nikita Popov <nikic@php.net> | 2014-05-16 18:54:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-05-22 19:00:25 +0200 |
| commit | 6f0f8511f2023142feba12a0633912c9dcd3d292 (patch) | |
| tree | 0d52845e16d9a6568934b08119c34b7189540c89 /Zend/zend_operators.c | |
| parent | 94d092dea3b31c2fb6157d3137a3c4792a2980f3 (diff) | |
| download | php-git-6f0f8511f2023142feba12a0633912c9dcd3d292.tar.gz | |
Assert that EMPTY_SWITCH_DEFAULT_CASE() cannot be reached in debug
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 9e68df083d..5fb88b1ca8 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -431,11 +431,7 @@ ZEND_API void convert_to_long_base(zval *op, int base) /* {{{ */ } return; } - default: - zend_error(E_WARNING, "Cannot convert to ordinal value"); - zval_dtor(op); - ZVAL_LONG(op, 0); - break; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -493,11 +489,7 @@ ZEND_API void convert_to_double(zval *op) /* {{{ */ } break; } - default: - zend_error(E_WARNING, "Cannot convert to real value (type=%d)", Z_TYPE_P(op)); - zval_dtor(op); - ZVAL_DOUBLE(op, 0); - break; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -580,10 +572,7 @@ ZEND_API void convert_to_boolean(zval *op) /* {{{ */ } break; } - default: - zval_dtor(op); - ZVAL_BOOL(op, 0); - break; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -650,10 +639,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) /* {{{ */ } break; } - default: - zval_dtor(op); - ZVAL_BOOL(op, 0); - break; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -833,9 +819,7 @@ try_again: case IS_REFERENCE: op = Z_REFVAL_P(op); goto try_again; - default: - zend_error(E_WARNING, "Cannot convert to ordinal value"); - return 0; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -875,9 +859,7 @@ try_again: case IS_REFERENCE: op = Z_REFVAL_P(op); goto try_again; - default: - zend_error(E_WARNING, "Cannot convert to real value (type=%d)", Z_TYPE_P(op)); - return 0.0; + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ @@ -934,9 +916,7 @@ try_again: case IS_REFERENCE: op = Z_REFVAL_P(op); goto try_again; - default: - //??? original code returns bool(0) - return STR_EMPTY_ALLOC(); + EMPTY_SWITCH_DEFAULT_CASE() } } /* }}} */ |