From cf71f4ded19f58f6b54dc0eeeb6d2ad7823a2081 Mon Sep 17 00:00:00 2001 From: ZhuangYumin Date: Fri, 10 Nov 2023 08:50:06 +0800 Subject: [PATCH] upd: allow bool * str --- src/utils.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/utils.cpp b/src/utils.cpp index 6da525b..0bbc29b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -118,16 +118,13 @@ int ConverToSameArithType(std::any &a, std::any &b, "situation", 33); if (allow_string_operation && (ptr_a_string || ptr_b_string)) { - if (!(ptr_a_string || ptr_a_int2048)) + if ((ptr_a_float || ptr_a_float)) throw InterpretException( "ConverToSameArithType: string operation not allowed in this " "situation", 34); - if (!(ptr_b_string || ptr_b_int2048)) - throw InterpretException( - "ConverToSameArithType: string operation not allowed in this " - "situation", - 35); + if (ptr_a_bool) a = ZYM::int2048(*ptr_a_bool); + if (ptr_b_bool) b = ZYM::int2048(*ptr_b_bool); return 1; } int level_a = (ptr_a_bool != nullptr ? 1 : 0) +