diff options
Diffstat (limited to 'zend/origexception.h')
-rw-r--r-- | zend/origexception.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/zend/origexception.h b/zend/origexception.h index 55f89cf..f997608 100644 --- a/zend/origexception.h +++ b/zend/origexception.h @@ -21,12 +21,12 @@ class OrigException : public Value, public Exception private: /** * Is this a an exception that was caught by extension C++ code. - * + * * When the object is initially created, we assume that it will be caught * by C++ code. If it later turns out that the PHP-CPP can catch this * exception after the extension C++ code ran, the variable is set back * to false. - * + * * @var bool */ bool _handled = true; @@ -38,40 +38,40 @@ private: */ TSRMLS_D; #endif - + public: /** * Constructor * @param val */ - OrigException(zval *val TSRMLS_DC) : - Value(val), Exception("OrigException") + OrigException(zval *val TSRMLS_DC) : + Value(val), Exception("OrigException") { #ifdef ZTS // copy tsrm_ls this->TSRMLS_C = TSRMLS_C; #endif } - + /** * Copy constructor * @param exception */ - OrigException(const OrigException &exception) : - Value(exception), Exception("OrigException"), _handled(exception._handled) + OrigException(const OrigException &exception) : + Value(exception), Exception("OrigException"), _handled(exception._handled) { #ifdef ZTS // copy tsrm_ls TSRMLS_C = exception.TSRMLS_C; #endif } - + /** * Move constructor * @param exception */ OrigException(OrigException &&exception) : - Value(std::move(exception)), Exception("OrigException"), _handled(exception._handled) + Value(std::move(exception)), Exception("OrigException"), _handled(exception._handled) { // set other exception to handled so that it wont do anything on destruction exception._handled = true; @@ -81,7 +81,7 @@ public: TSRMLS_C = exception.TSRMLS_C; #endif } - + /** * Destructor */ @@ -90,11 +90,11 @@ public: // if the exception was not handled by C++ code, we're not going to do anything // and the exception stays active if (!_handled) return; - + // the exception was handled, so we should clean it up zend_clear_exception(TSRMLS_C); } - + /** * This is _not_ a native exception, it was thrown by a PHP script * @return bool @@ -103,7 +103,7 @@ public: { return false; } - + /** * Reactivate the exception */ @@ -127,15 +127,15 @@ inline void process(Exception &exception TSRMLS_DC) // the exception is native, call the zend throw method zend_throw_exception(zend_exception_get_default(TSRMLS_C), (char *)exception.what(), 0 TSRMLS_CC); } - + // or does it have its own report function? else if (!exception.report()) { - // this is not a native exception, so it was originally thrown by a - // php script, and then not caught by the c++ of the extension, we are + // this is not a native exception, so it was originally thrown by a + // php script, and then not caught by the c++ of the extension, we are // going to tell to the exception that it is still active OrigException &orig = static_cast<OrigException&>(exception); - + // reactive the exception orig.reactivate(); } |