feat: encapsulate IPrintExceptionImpl in internals namespace; enhance exception handling macros

Author: engsr6982

src/helper/APIHelper.cc

@@ -128,7 +128,7 @@ void ToString(Local<Object> const& value, std::ostringstream& oss) {
     }
 }
 
-
+namespace internals {
 void IPrintExceptionImpl(
     std::string const& exceptionFullName,
     std::string const& exceptionMessage,
@@ -143,6 +143,7 @@ void IPrintExceptionImpl(
     ptr->getLogger().error("Exception plugin: {}", plugin);
     ptr->getLogger().error("Exception Type: {}\n{}\n{}", exceptionFullName, exceptionMessage, stackTrace);
 }
+} // namespace internals
 
 
 } // namespace jse

src/helper/APIHelper.h

@@ -18,9 +18,15 @@ template <typename T>
     return EngineScope::currentEngine()->isInstanceOf<T>(value);
 }
 
+
 // ============
 // 异常处理
 // ============
+#define ERR_WRONG_ARG_TYPE   "Wrong argument type, please check the documentation" /* 参数类型错误，请查阅文档 */
+#define ERR_TOO_FEW_ARGS     "Too few arguments"                                   /* 参数数量不足 */
+#define ERR_WRONG_ARGS_COUNT "Wrong arguments count"                               /* 参数数量错误 */
+
+namespace internals {
 void IPrintExceptionImpl(
     std::string const& exceptionFullName, // 异常全名
     std::string const& exceptionMessage,  // 异常信息
@@ -29,44 +35,59 @@ void IPrintExceptionImpl(
     std::string const& funcFullName,      // 函数全名
     std::string const& plugin             // 插件名
 );
+}
 
-#define PRINT_SCRIPT_EXCEPTION(EXC_NAME, EXC_INSTANCE)                                                                 \
-    IPrintExceptionImpl(                                                                                               \
+#define PRINT_SCRIPT_EXCEPTION_WITH_FUNC(EXC_NAME, EXC_INSTANCE, FUNC, FUNC_FULL)                                      \
+    internals::IPrintExceptionImpl(                                                                                    \
         EXC_NAME,                                                                                                      \
         (EXC_INSTANCE).message(),                                                                                      \
         (EXC_INSTANCE).stacktrace(),                                                                                   \
-        __func__,                                                                                                      \
-        __FUNCTION__,                                                                                                  \
+        FUNC,                                                                                                          \
+        FUNC_FULL,                                                                                                     \
         ENGINE_DATA()->mFileName                                                                                       \
     )
 
-#define ICATCH_IMPL(RET_CODE)                                                                                          \
+// 默认使用当前函数名的宏
+#define PRINT_SCRIPT_EXCEPTION(EXC_NAME, EXC_INSTANCE)                                                                 \
+    PRINT_SCRIPT_EXCEPTION_WITH_FUNC(EXC_NAME, EXC_INSTANCE, __func__, __FUNCTION__)
+
+// 通用异常捕获实现
+#define ICATCH_IMPL_GENERIC(FUNC, FUNC_FULL, ...)                                                                      \
     catch (script::Exception const& err) {                                                                             \
-        PRINT_SCRIPT_EXCEPTION("script::Exception", err);                                                              \
-        RET_CODE;                                                                                                      \
+        PRINT_SCRIPT_EXCEPTION_WITH_FUNC("script::Exception", err, FUNC, FUNC_FULL);                                   \
+        __VA_ARGS__;                                                                                                   \
     }                                                                                                                  \
     catch (std::exception const& err) {                                                                                \
-        PRINT_SCRIPT_EXCEPTION("std::exception", script::Exception(err.what()));                                       \
-        RET_CODE;                                                                                                      \
+        PRINT_SCRIPT_EXCEPTION_WITH_FUNC("std::exception", script::Exception(err.what()), FUNC, FUNC_FULL);            \
+        __VA_ARGS__;                                                                                                   \
     }                                                                                                                  \
     catch (...) {                                                                                                      \
-        PRINT_SCRIPT_EXCEPTION("unknown", script::Exception("Unknown exception"));                                     \
-        RET_CODE;                                                                                                      \
+        PRINT_SCRIPT_EXCEPTION_WITH_FUNC("unknown", script::Exception("Unknown exception"), FUNC, FUNC_FULL);          \
+        __VA_ARGS__;                                                                                                   \
     }
 
-#define ERR_WRONG_ARG_TYPE   "Wrong argument type, please check the documentation" /* 参数类型错误，请查阅文档 */
-#define ERR_TOO_FEW_ARGS     "Too few arguments"                                   /* 参数数量不足 */
-#define ERR_WRONG_ARGS_COUNT "Wrong arguments count"                               /* 参数数量错误 */
-
-/* 仅捕获异常 */
-#define CatchNotReturn ICATCH_IMPL()
+/* 仅捕获异常（默认） */
+#define CatchNotReturn ICATCH_IMPL_GENERIC(__func__, __FUNCTION__)
 
-/* 捕获异常并返回自定义类型 */
-#define CatchAndReturn(RET_VALUE) ICATCH_IMPL(return (RET_VALUE))
+/* 捕获异常并返回自定义类型（默认） */
+#define CatchAndReturn(RET_VALUE) ICATCH_IMPL_GENERIC(__func__, __FUNCTION__, return (RET_VALUE))
 
-/* 捕获异常并返回 undefined */
+/* 捕获异常并返回 undefined（默认） */
 #define Catch CatchAndReturn(Local<Value>())
 
+// ============
+// Lambda专用宏
+// ============
+/* 捕获异常并返回自定义类型（需指定函数信息） */
+#define CatchLambdaAndReturn(FUNC, FUNC_FULL, RET_VALUE) ICATCH_IMPL_GENERIC(FUNC, FUNC_FULL, return (RET_VALUE))
+
+/* 捕获异常并返回 undefined（需指定函数信息） */
+#define CatchLambda(FUNC, FUNC_FULL) CatchLambdaAndReturn(FUNC, FUNC_FULL, Local<Value>())
+
+/* 仅捕获异常（需指定函数信息） */
+#define CatchLambdaNotReturn(FUNC, FUNC_FULL) ICATCH_IMPL_GENERIC(FUNC, FUNC_FULL)
+
+
 /* 捕获异常并抛回脚本层 */
 #define CatchAndThrow                                                                                                  \
     catch (script::Exception const& e) {                                                                               \