simplify CALL_AND_HANDLE and move it to zend_container.h

Author: Frederick888

bencode.cc

@@ -4,6 +4,23 @@
 #include "binit.h"
 #include "php_bencode.h"
 
+#define CALL_AND_HANDLE(expr)                                                                                                \
+    try {                                                                                                                    \
+        expr;                                                                                                                \
+    } catch (const std::invalid_argument &ia) {                                                                              \
+        zend_throw_exception(NULL, ("Invalid argument: " + std::string(ia.what())).c_str(), BENCODE_ERROR_INVALID_ARGUMENT); \
+        RETURN_NULL();                                                                                                       \
+    } catch (const std::out_of_range &oor) {                                                                                 \
+        zend_throw_exception(NULL, ("Out of Range error: " + std::string(oor.what())).c_str(), BENCODE_ERROR_OUT_OF_RANGE);  \
+        RETURN_NULL();                                                                                                       \
+    } catch (const std::exception &e) {                                                                                      \
+        zend_throw_exception(NULL, ("Undefined error: " + std::string(e.what())).c_str(), BENCODE_ERROR_UNDEFINED);          \
+        RETURN_NULL();                                                                                                       \
+    } catch (...) {                                                                                                          \
+        zend_throw_exception(NULL, "Unknown error", BENCODE_ERROR_UNKNOWN);                                                  \
+        RETURN_NULL();                                                                                                       \
+    }
+
 /**** BITEM *****/
 PHP_METHOD(bitem, __construct)
 {

bitem.cc

@@ -8,7 +8,7 @@
 
 zval *bitem::throw_general_exception(const std::string message)
 {
-    zend_throw_exception(NULL, message.c_str(), 1);
+    zend_throw_exception(NULL, message.c_str(), BENCODE_ERROR_BITEM);
     return bitem::get_zval_bool(false);
 }
 

php_bencode.h

@@ -20,21 +20,4 @@ PHP_MSHUTDOWN_FUNCTION(bencode);
 extern zend_module_entry bencode_module_entry;
 #define phpext_bencode_ptr &bencode_module_entry
 
-#define CALL_AND_HANDLE(expr)                                                                                 \
-    try {                                                                                                     \
-        return (expr);                                                                                        \
-    } catch (const std::invalid_argument &ia) {                                                               \
-        zend_throw_exception(NULL, std::string("Invalid argument: " + std::string(ia.what())).c_str(), 2);    \
-        RETURN_NULL();                                                                                        \
-    } catch (const std::out_of_range &oor) {                                                                  \
-        zend_throw_exception(NULL, std::string("Out of Range error: " + std::string(oor.what())).c_str(), 3); \
-        RETURN_NULL();                                                                                        \
-    } catch (const std::exception &e) {                                                                       \
-        zend_throw_exception(NULL, std::string("Undefined error: " + std::string(e.what())).c_str(), 4);      \
-        RETURN_NULL();                                                                                        \
-    } catch (...) {                                                                                           \
-        zend_throw_exception(NULL, "Unkown error", 5);                                                        \
-        RETURN_NULL();                                                                                        \
-    }
-
 #endif

zend_container.h

@@ -11,6 +11,14 @@ extern "C" {
 #include "blist.h"
 #include "bstr.h"
 
+/* clang-format off */
+#define BENCODE_ERROR_BITEM             1
+#define BENCODE_ERROR_INVALID_ARGUMENT  2
+#define BENCODE_ERROR_OUT_OF_RANGE      3
+#define BENCODE_ERROR_UNDEFINED         4
+#define BENCODE_ERROR_UNKNOWN           5
+/* clang-format on */
+
 #define ZEND_CONTAINER_PRE(bclass) \
     typedef struct {               \
         bclass *bnode_data;        \