archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Exceptions updates:

Browse source 
- Enforce exceptions to be derived from class Exception.  This allows
  users to perform catch-all.  It's not yet complete, so don't get
  comfortable with it just yet :)  Updates are coming soon.
- Implement zend_throw_exception() using zend_throw_exception_ex()
This commit is contained in:
Zeev Suraski 2004-02-12 10:24:40 +00:00
parent 559b14611d
commit d9630a595b
6 changed files with 46 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Zend/zend_default_classes.c
View file

@ -25,7 +25,7 @@
#include "zend_builtin_functions.h" #include "zend_builtin_functions.h"
#include "zend_interfaces.h" #include "zend_interfaces.h"
static zend_class_entry *default_exception_ce; zend_class_entry *default_exception_ce;
static zend_object_handlers default_exception_handlers; static zend_object_handlers default_exception_handlers;
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC); ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
@ -452,36 +452,13 @@ ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code
zend_throw_exception_internal(ex TSRMLS_CC); zend_throw_exception_internal(ex TSRMLS_CC);
} }
/* at the moment we can't use zend_throw_exception_ex because we don't have a protable
* vsnprintf that tells us the number of characters needed nor do we have spprintf from
* php or asprintf from glibc always.
*/
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC) ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC)
{ {
zval *ex; zend_throw_exception_ex(exception_ce, code TSRMLS_CC, "%s", message);
MAKE_STD_ZVAL(ex);
if (exception_ce) {
if (!instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
zend_error(E_NOTICE, "Exceptions must be derived from exception");
exception_ce = default_exception_ce;
}
} else {
exception_ce = default_exception_ce;
}
object_init_ex(ex, exception_ce);
if (message) {
zend_update_property_string(default_exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC);
}
if (code) {
zend_update_property_long(default_exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC);
}
zend_throw_exception_internal(ex TSRMLS_CC);
} }
static void zend_error_va(int type, const char *file, uint lineno, const char *format, ...) static void zend_error_va(int type, const char *file, uint lineno, const char *format, ...)
{ {
va_list args; va_list args;
@ -534,6 +511,24 @@ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC)
} }
} }
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC)
{
zend_class_entry *exception_ce;
if (exception == NULL || exception->type != IS_OBJECT) {
zend_error(E_ERROR, "Need to supply an object when throwing an exception");
}
exception_ce = Z_OBJCE_P(exception);
if (!exception_ce || !instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
zend_error(E_ERROR, "Exceptions must valid objects that are derived from class Exception");
}
zend_throw_exception_internal(exception TSRMLS_CC);
}
ZEND_API void zend_register_default_classes(TSRMLS_D) ZEND_API void zend_register_default_classes(TSRMLS_D)
{ {
zend_register_interfaces(TSRMLS_C); zend_register_interfaces(TSRMLS_C);

1
Zend/zend_default_classes.h
View file

@ -31,6 +31,7 @@ ZEND_API void zend_register_default_classes(TSRMLS_D);
* message NULL or the message of the exception */ * message NULL or the message of the exception */
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC); ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...); ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...);
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC);
/* show an exception using zend_error(E_ERROR,...) */ /* show an exception using zend_error(E_ERROR,...) */
ZEND_API void zend_exception_error(zval *exception TSRMLS_DC); ZEND_API void zend_exception_error(zval *exception TSRMLS_DC);

49
Zend/zend_exceptions.c
View file

@ -25,7 +25,7 @@
#include "zend_builtin_functions.h" #include "zend_builtin_functions.h"
#include "zend_interfaces.h" #include "zend_interfaces.h"
static zend_class_entry *default_exception_ce; zend_class_entry *default_exception_ce;
static zend_object_handlers default_exception_handlers; static zend_object_handlers default_exception_handlers;
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC); ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
@ -452,36 +452,13 @@ ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code
zend_throw_exception_internal(ex TSRMLS_CC); zend_throw_exception_internal(ex TSRMLS_CC);
} }
/* at the moment we can't use zend_throw_exception_ex because we don't have a protable
* vsnprintf that tells us the number of characters needed nor do we have spprintf from
* php or asprintf from glibc always.
*/
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC) ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC)
{ {
zval *ex; zend_throw_exception_ex(exception_ce, code TSRMLS_CC, "%s", message);
MAKE_STD_ZVAL(ex);
if (exception_ce) {
if (!instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
zend_error(E_NOTICE, "Exceptions must be derived from exception");
exception_ce = default_exception_ce;
}
} else {
exception_ce = default_exception_ce;
}
object_init_ex(ex, exception_ce);
if (message) {
zend_update_property_string(default_exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC);
}
if (code) {
zend_update_property_long(default_exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC);
}
zend_throw_exception_internal(ex TSRMLS_CC);
} }
static void zend_error_va(int type, const char *file, uint lineno, const char *format, ...) static void zend_error_va(int type, const char *file, uint lineno, const char *format, ...)
{ {
va_list args; va_list args;
@ -534,6 +511,24 @@ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC)
} }
} }
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC)
{
zend_class_entry *exception_ce;
if (exception == NULL || exception->type != IS_OBJECT) {
zend_error(E_ERROR, "Need to supply an object when throwing an exception");
}
exception_ce = Z_OBJCE_P(exception);
if (!exception_ce || !instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
zend_error(E_ERROR, "Exceptions must valid objects that are derived from class Exception");
}
zend_throw_exception_internal(exception TSRMLS_CC);
}
ZEND_API void zend_register_default_classes(TSRMLS_D) ZEND_API void zend_register_default_classes(TSRMLS_D)
{ {
zend_register_interfaces(TSRMLS_C); zend_register_interfaces(TSRMLS_C);

1
Zend/zend_exceptions.h
View file

@ -31,6 +31,7 @@ ZEND_API void zend_register_default_classes(TSRMLS_D);
* message NULL or the message of the exception */ * message NULL or the message of the exception */
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC); ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...); ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...);
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC);
/* show an exception using zend_error(E_ERROR,...) */ /* show an exception using zend_error(E_ERROR,...) */
ZEND_API void zend_exception_error(zval *exception TSRMLS_DC); ZEND_API void zend_exception_error(zval *exception TSRMLS_DC);

2
Zend/zend_execute.h
View file

@ -65,8 +65,6 @@ ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***
ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC); ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC); ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC);
static inline int i_zend_is_true(zval *op) static inline int i_zend_is_true(zval *op)
{ {
int result; int result;

7
Zend/zend_execute_API.c
View file

@ -1221,13 +1221,6 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC)
EG(current_execute_data)->opline = &EG(active_op_array)->opcodes[EG(active_op_array)->last-1-1]; EG(current_execute_data)->opline = &EG(active_op_array)->opcodes[EG(active_op_array)->last-1-1];
} }
ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC)
{
if (exception == NULL) {
zend_error(E_ERROR, "Need to supply object when throwing exception");
}
zend_throw_exception_internal(exception TSRMLS_CC);
}