diff options
| author | Zeev Suraski <zeev@php.net> | 2004-02-12 10:38:14 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-02-12 10:38:14 +0000 |
| commit | 00ed3bad290543b2145339fc3c3e7c4d81b7c32d (patch) | |
| tree | a9dd9e51ed44bc3ec6ec89430ac953f45cdb9bbd /Zend/zend_execute_API.c | |
| parent | e189d89672167dee73d53ac642c2a85979249d83 (diff) | |
| download | php-git-00ed3bad290543b2145339fc3c3e7c4d81b7c32d.tar.gz | |
Centralize exceptions code in zend_exceptions.[ch].
Remove zend_default_classes.h (use zend_exceptions.h instead)
NOTE: This currently breaks the build, fixes to php-src and pecl coming
soon
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 72dd623979..37ec49417a 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -29,7 +29,7 @@ #include "zend_ptr_stack.h" #include "zend_constants.h" #include "zend_extensions.h" -#include "zend_default_classes.h" +#include "zend_exceptions.h" #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif @@ -1200,42 +1200,6 @@ check_fetch_type: return *pce; } -void zend_throw_exception_internal(zval *exception TSRMLS_DC) -{ - if (exception != NULL) { - if (EG(exception)) { - /* FIXME: bail out? */ - return; - } - EG(exception) = exception; - } - if (!EG(current_execute_data)) { - zend_error(E_ERROR, "Exception thrown without a stack frame"); - } - - if ((EG(current_execute_data)->opline+1)->opcode == ZEND_HANDLE_EXCEPTION) { - /* no need to rethrow the exception */ - return; - } - EG(opline_before_exception) = EG(current_execute_data)->opline; - EG(current_execute_data)->opline = &EG(active_op_array)->opcodes[EG(active_op_array)->last-1-1]; -} - - - - -ZEND_API void zend_clear_exception(TSRMLS_D) -{ - if (!EG(exception)) { - return; - } - zval_ptr_dtor(&EG(exception)); - EG(exception) = NULL; - EG(current_execute_data)->opline = EG(opline_before_exception); -#if ZEND_DEBUG - EG(opline_before_exception) = NULL; -#endif -} #define MAX_ABSTRACT_INFO_CNT 3 |