From 59a9c178931f1948a5165240e072f3e952c0a510 Mon Sep 17 00:00:00 2001 From: ablehe Date: Fri, 13 Mar 2026 20:07:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?mac=20=E7=BC=96=E8=AF=91=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 15 +- dl/CMakeLists.txt | 11 +- dl/base/dl_concept.h | 4 +- dl/base/dl_string.h | 2252 ++++++++++++++++++++------------------- dl/io/dl_file.cpp | 15 + dl/system/dl_infoware.h | 2 +- dl/system/dl_platform.h | 6 + 7 files changed, 1206 insertions(+), 1099 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 900fb4cb..f34d90c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,10 @@ set(CMAKE_CXX_STANDARD 23) # add_link_options(-stdlib=libc++ -lc++abi) #endif() +if (APPLE) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +endif() + message("------------------第三方库option------------------") if(DEFINED BUILD_DOCS) unset(BUILD_DOCS CACHE) @@ -140,7 +144,16 @@ message("------------------flac 音频格式库-----------") add_subdirectory ("third/flac") message("------------------openal-soft 音频库-----------") if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux") - add_subdirectory ("third/openal-soft") + # Mac系统(Darwin)下,先修复openal-soft的dl依赖问题 + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + # 定义CMAKE_DL_LIBS(Mac下指向系统dl库),避免openal-soft找不到dl目标 + set(CMAKE_DL_LIBS "-ldl") + # 强制跳过openal-soft的export/install(核心报错点) + set(OPENAL_BUILD_INSTALL OFF CACHE BOOL "Disable OpenAL install" FORCE) + set(OPENAL_BUILD_EXAMPLES OFF CACHE BOOL "Disable OpenAL examples" FORCE) + endif() + # 再添加openal-soft子目录 + add_subdirectory ("third/openal-soft") endif() message("------------------rtmidi midi库-----------") if (NOT CMAKE_SYSTEM_NAME MATCHES "Android") diff --git a/dl/CMakeLists.txt b/dl/CMakeLists.txt index 2c1b1000..b49c10cf 100644 --- a/dl/CMakeLists.txt +++ b/dl/CMakeLists.txt @@ -249,7 +249,16 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux") target_link_libraries(${PROJECT_NAME} PRIVATE libcrypto.so) target_link_libraries(${PROJECT_NAME} PRIVATE libssl.so) endif() - +if (APPLE) + # Apple Silicon + set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@3") + # Intel Mac 替换为:set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@3") + + # 添加头文件路径 + include_directories(${OPENSSL_ROOT_DIR}/include) + # 添加库路径 + link_directories(${OPENSSL_ROOT_DIR}/lib) +endif() # asio include_directories(${CMAKE_SOURCE_DIR}/third/asio/include) # sqlite diff --git a/dl/base/dl_concept.h b/dl/base/dl_concept.h index 028c2fd7..eb8785a3 100644 --- a/dl/base/dl_concept.h +++ b/dl/base/dl_concept.h @@ -15,13 +15,13 @@ #if (DL_PLATFORM == DL_PLATFORM_ANDROID) #include #endif +#include #include "system/dl_platform.h" namespace dl { -#if (DL_PLATFORM != DL_PLATFORM_ANDROID) -//标准库为小写下划线命名,我们使用大写开头 +#if ((DL_PLATFORM != DL_PLATFORM_ANDROID) && (DL_PLATFORM != DL_PLATFORM_APPLE))//标准库为小写下划线命名,我们使用大写开头 template concept PopFrontAble = requires(T x) { x.pop_front(); }; diff --git a/dl/base/dl_string.h b/dl/base/dl_string.h index 5a79d6ab..65ddeeb5 100644 --- a/dl/base/dl_string.h +++ b/dl/base/dl_string.h @@ -1,1095 +1,1159 @@ -/** -* @file dl_string.h -* @brief 字符串相关 -* -* -* @version 1.0 -* @author lveyou -* @date 23-06-23 -* -* @note vs设置多字节编码,并且定义utf-8 -* @note 字节流请优先使用Buffer类 -* -* @note string的size和length相同。我们需要保证结尾不包含0的 -* @note 现在字符串统一使用基于string的 utf-8编码,在需要对字符拆分处理时再转换到utf-32编码 -* @note wstring_convert在C++17已经弃用,使用iconv来转换编码,在CodeCvt文件 -* -* @note to_string转换为字符串, -* @note toXxx作为复杂类型转换,format多个变量时使用 -* @note format非编译期时使用:vformat(fmt, std::make_format_args(v)); -*/ -#pragma once -#include -#include -#include -#include - -#include - -#include "memory/dl_code_cvt.h" -#include "dl_range.h" -#include "math/dl_algorithm.h" -#include "io/dl_log.h" -#include "base/dl_type_def.h" -#include "base/dl_vector2.h" -#include "base/dl_array2.h" -#include "memory/dl_buffer.h" - -namespace dl -{ - - -// unordered_map支持 string_view -struct string_hash -{ - using hash_type = std::hash; - using is_transparent = void; - - std::size_t operator()(const char* str) const { return hash_type{}(str); } - std::size_t operator()(std::string_view str) const { return hash_type{}(str); } - std::size_t operator()(std::string const& str) const { return hash_type{}(str); } -}; - -//-----------------------------字符串连接------------------- -inline std::string& operator+=(std::string& a, std::string_view b) -{ - a.append(b); - return a; -} -inline std::string operator+(const std::string& a, std::string_view b) -{ - std::string ret{ a }; - return ret += b; -} -inline std::string operator+(std::string_view a, std::string_view b) -{ - std::string ret{ a }; - return ret += b; -} -/** -* @brief to_string包装 -* @note 小数默认两位 -*/ -template -std::string to_string(T v) -{ - if constexpr (std::is_floating_point_v) - { - return fmt::format("{:.2f}", v); - } - else - return std::to_string(v); -} - -/** -* @brief array通用to_string -*/ -template -std::string to_string(const std::array& arr, std::string_view delimiter = ", ") -{ - static_assert(N != 0); - std::string ret; - for (size_t i = 0; i < N - 1; ++i) - { - ret += dl::to_string(arr[i]); - ret += delimiter; - } - ret += dl::to_string(arr[N - 1]); - return ret; -} -template -std::string to_string(const Array& arr, std::string_view delimiter = ", ") -{ - static_assert(N != 0); - std::string ret; - for (size_t i = 0; i < N - 1; ++i) - { - ret += dl::to_string(arr[i]); - ret += delimiter; - } - ret += dl::to_string(arr[N - 1]); - return ret; -} -template -std::string to_string(const ArrayS2& arr, std::string_view delimiter = ", ") -{ - static_assert(N != 0); - std::string ret; - for (size_t i = 0; i < N - 1; ++i) - { - ret += dl::to_string(arr.x[i]); - ret += delimiter; - ret += dl::to_string(arr.y[i]); - ret += delimiter; - } - ret += dl::to_string(arr.x[N - 1]); - ret += delimiter; - ret += dl::to_string(arr.y[N - 1]); - return ret; -} -/** -* @brief vector通用to_string -*/ -template -std::string to_string_ex(const std::vector& vec, std::string_view delimiter = ", ") -{ - if (vec.empty()) - return {}; - std::string ret; - for (size_t i = 0; i < vec.size() - 1; ++i) - { - ret += dl::to_string(vec[i]); - ret += delimiter; - } - ret += dl::to_string(vec[vec.size() - 1]); - return ret; -} - -//! 错误码信息 -std::string to_string(std::error_code code); - -//! 异常信息 -std::string to_string(std::exception& e); - -/** -* @brief buf转为utf8字符串(不进行检查) -*/ -template<> -std::string to_string(BufferView buf); -template<> -inline std::string to_string(Buffer buf) -{ - return to_string(BufferView{ buf }); -} - -/** -* @brief buf转为utf8字符串(进行检查) -*/ -std::string to_string_check(BufferView buf, bool tips = true); - -/** -* @brief buf转为16进制字符串 -*/ -std::string to_string_hex(BufferView buf, bool add_tag = false); - -/** -* @brief buf转为16进制字符串 -*/ -template -std::string to_string_hex(std::array buf, bool add_tag = false) -{ - return to_string_hex(std::span(buf), add_tag); -} - -/** -* @brief buf转为字符串,若不为utf8则转为16进制 -*/ -std::string to_string_auto(BufferView buf, bool add_tag = false); - -enum class StringType -{ - NORMAL, - INTGER, - FLOAT -}; -//! 字符串操作 -namespace String -{ -/** -* @brief 字符串 -> Float -* @note 失败返回0 -*/ -inline Float toFloat(std::string_view str, Float default_v = 0) -{ - std::from_chars(str.data(), str.data() + str.size(), default_v); - return default_v; -} -/** -* @brief 转为整数,失败返回设定的默认值 -* @note 不建议依赖默认值,会增加代码复杂度 -*/ -inline int toInt(std::string_view str, int default_v = 0) -{ - std::from_chars(str.data(), str.data() + str.size(), default_v); - return default_v; -} -/** -* @brief 转为整数,失败返回设定的默认值 -* @note 不建议依赖默认值,会增加代码复杂度 -*/ -inline int64_t toInt64(std::string_view str, int64_t default_v = 0) -{ - std::from_chars(str.data(), str.data() + str.size(), default_v); - return default_v; -} -/** -* @brief 转为整数,失败不修改原值 -*/ -inline bool getInt(std::string_view str, int& ret) -{ - std::from_chars_result r = std::from_chars(str.data(), str.data() + str.size(), ret); - return r.ec == std::errc(); -} - -/** -* @brief 字符串 -> Point -*/ -template -Array toPoint(std::string_view str, char d = ',') -{ - std::vector vec; - split(str, d, vec); - if (vec.size() == 0) - { - log_warn("分割后数量为0!"); - return {}; - } - else if (vec.size() == 1) - { - log_warn("分割后数量为1!"); - return { toInt(vec[0]) , 0}; - } - return { toInt(vec[0]), toInt(vec[1]) }; -} -/** -* @brief 字符串 -> Position -*/ -template -Array toPosition(std::string_view str, char d = ',') -{ - std::vector vec; - split(str, d, vec); - if (vec.size() == 0) - { - log_warn("分割后数量为0!"); - return {}; - } - else if (vec.size() == 1) - { - log_warn("分割后数量为1!"); - return { toFloat(vec[0]) , 0 }; - } - return { toFloat(vec[0]), toFloat(vec[1]) }; -} - -inline Point2 toPoint2(std::string_view str, char d = ',') -{ - return toPoint<2>(str, d); -} -inline Position toPosition2(std::string_view str, char d = ',') -{ - return toPosition<2>(str, d); -} - -/** -* @brief 返回字符串类型 -*/ -constexpr StringType GetType(std::string_view str) -{ - bool has_dot = false; - for (size_t i = 0; i < str.size(); ++i) - { - const char& ch = str[i]; - if (std::isdigit(ch)) - continue; - else if (i == 0 && (ch == '+' || ch == '-')) - continue; - else if (!has_dot && ch == '.') - { - has_dot = true; - continue; - } - else - return StringType::NORMAL; - } - return has_dot ? StringType::FLOAT : StringType::INTGER; -} -/** -* @brief 两侧添加引号 -*/ -inline std::string AddQuotes(std::string_view str, char quotes = '\"') -{ - std::string ret; - ret.reserve(str.size() + 2); - ret += quotes; - ret += str; - ret += quotes; - return ret; -} -/** -* @brief 获取宽字符宽度(控制台显示优化) -*/ -size_t Wcwidth(wchar_t ch); -/** -* @brief 多行文本填充字符至一样宽(控制台显示优化) -* @note 假设为等宽字符,中文算2个 -*/ -std::string FillEndl(std::string_view str, char ch = ' '); -/** -* @brief 返回不能作为文件名的字符 -*/ -constexpr std::string_view GetNotFileName() -{ - return R"(<>/\|:"*?)"; -} - -/** -* @brief 移除不能作为文件名的字符 -*/ -inline void EraseNotFileName(std::string& name) -{ - Erase::Match(name, std::string{ String::GetNotFileName() }); -} - -/** -* @brief 将字符串字母变为小写 -*/ -inline void ToLower(std::string& str) -{ - std::transform(str.begin(), str.end(), str.begin(), ::tolower); -} - -/** -* @brief 将字符串字母变为小写 -*/ -inline std::string ToLower(const std::string& str) -{ - std::string ret = str; - std::transform(ret.begin(), ret.end(), ret.begin(), ::tolower); - return ret; -} -/** -* @brief 将字符串字母变为大写 -*/ -inline void ToUpper(std::string& str) -{ - std::transform(str.begin(), str.end(), str.begin(), ::toupper); -} -/** -* @brief 将字符串字母变为大写 -*/ -inline std::string ToUpper(std::string_view str) -{ - std::string ret{ str }; - ToUpper(ret); - return ret; -} -/** -* @brief 字符串相等,并且不区分大小写 -*/ -inline bool EqualToLower(std::string_view a, std::string_view b) -{ - if (a.size() != b.size()) - return false; - if (a.empty()) - return true; - for (size_t i = 0; i < a.size(); ++i) - { - if (std::tolower(a[i]) != std::tolower(b[i])) - return false; - } - return true; -} - -/** -* @brief 拼接字符串 -*/ -inline std::string Splicing(const std::vector& vec, - std::string_view delimiter = ", ", std::string_view end = "") -{ - if (vec.empty()) - return {}; - if (vec.size() == 1) - return vec[0] + end; - - std::string ret; - for (size_t i = 0; i < vec.size() - 1; ++i) - { - ret += vec[i]; - ret += delimiter; - } - ret += vec[vec.size() - 1]; - ret += end; - return ret; -} -/** -* @brief 字符串为空白字符,一般意义上(\n\t空格) -*/ -inline bool IsBlank(char ch) -{ - return ch == ' ' - || ch == '\n' - || ch == '\t'; -} - -/** -* @brief 字符串为空白(全为\n\t空格) -*/ -inline bool IsBlank(std::string_view str) -{ - for (char ch : str) - { - if (!IsBlank(ch)) - return false; - } - return true; -} - -/** -* @brief 字符串删除指定字符 -* @note 出于效率和方便使用,不使用Erase的函数 -*/ -inline std::string EraseCharAll(std::string_view str, std::string_view vec_char) -{ - std::string ret; - for (auto& iter : str) - { - if (Every::NotEqual(vec_char, iter)) - ret.push_back(iter); - } - return ret; -} -/** -* @brief 字符串删除指定字符,从前面N个 -* @note 出于效率和方便使用,不使用Erase的函数 -*/ -inline std::string EraseCharN(std::string_view str, std::string_view vec_char, size_t n = 1) -{ - std::string ret; - - for (auto& iter : str) - { - if (n && Any::Equal(vec_char, iter)) - { - --n; - continue; - } - else - ret.push_back(iter); - } - return ret; -} -/** -* @brief 字符串删除指定字符,从头部删除,直到不满足条件 -* @note 出于效率和方便使用,不使用Erase的函数 -*/ -inline std::string EraseCharHead(std::string_view str, std::string_view vec_char) -{ - std::string ret; - - bool check = true; - for (auto& iter : str) - { - if (check) - { - if (Any::Equal(vec_char, iter)) - ;// 需要删除,仍需判断 - else - { - check = false; - ret.push_back(iter); - } - } - else - ret.push_back(iter); - } - return ret; -} -/** -* @brief 字符串删除空字符 -*/ -inline std::string EraseBlank(std::string_view str) -{ - return EraseCharAll(str, " \t\n"); -} -/** -* @brief 字符串删除空字符N个,从前面 -*/ -inline std::string EraseBlankN(std::string_view str, size_t n = 1) -{ - return EraseCharN(str, " \t\n", n); -} -/** -* @brief 字符串删除空字符 -*/ -inline std::string EraseBlankHead(std::string_view str) -{ - return EraseCharHead(str, " \t\n"); -} - -/** -* @brief wchar_t字符返回utf8 -*/ -inline std::string GetUtf8ByWchar(wchar_t wc, size_t offset = 0) -{ - // 某些平台wchar_t是4字节,必须使用u32string - std::u32string s{ (char32_t)(wc + offset) }; - - return CodeCvt::Utf32ToUtf8(s); -} - - -/** - * @brief 返回ASCII码表,通过Text直接显示 -*/ -//string GetAscii() -//{ -// string str_ascii = format("ascii表:\n0 -> /0[t_8]"); -// for (char ch = 1; ch < 128; ++ch) -// { -// if (ch == '\n') -// str_ascii += format("{} -> {}[t_8]", to_string(ch), "/n"); -// else if (ch == '\t') -// str_ascii += format("{} -> {}[t_8]", to_string(ch), "/t"); -// else if (ch == '[') -// str_ascii += format("{} -> {}[t_8]", to_string(ch), "[l]"); -// else if (ch == ']') -// str_ascii += format("{} -> {}[t_8]", to_string(ch), "[r]"); -// else -// str_ascii += format("{} -> {}[t_8]", to_string(ch), char(ch)); -// -// if ((ch - 1) % 6 == 0) -// str_ascii += "\n"; -// } -// return str_ascii; -//} - -/** -* @brief pintf替代品,一般情况不使用 -*/ -std::string Sprintf(const char* format, ...); - -/** -* @brief 将整数转为千位分隔符的字符串。 -*/ -template -std::string SplitIntegerToThousands(T integer) -{ - return r_insert_per_num(to_string(integer), ',', 3); -} - -/** -* @brief 分割字符串 -*/ -inline std::vector Split(const std::string& str, char d) -{ - std::vector ret; - split(str, d, ret); - return ret; -} -inline std::vector Split(std::string_view str, char d) -{ - std::vector ret; - split(str, d, ret); - return ret; -} - -/** -* @brief 分割字符串 -*/ -inline std::vector Split(const std::string& str, const std::string& d) -{ - std::vector ret; - split_sub(str, d, ret); - return ret; -} -inline std::vector Split(std::string_view str, std::string_view d) -{ - std::vector ret; - split_sub(str, d, ret); - return ret; -} - -/** -* @brief 处理子字符串(通过特定字符分割) -* @param[in] str 整个字符串 -* @param[in] vec_ch 匹配的字符 -* @note 效率更高,连续匹配不会返回空串 -*/ -inline std::vector SplitViewNoEmpty(std::string_view str, std::string_view vec_ch) -{ - std::vector ret; - size_t beg = 0; - size_t cur = 0; - for (; cur < str.size(); ++cur) - { - if (Any::Equal(vec_ch, str[cur])) - { - if (beg != cur) - ret.push_back({ str.data() + beg, str.data() + cur }); - beg = cur + 1; - } - } - if (beg != cur) - ret.push_back({ str.data() + beg, str.data() + cur }); - return ret; -} -inline std::vector SplitViewNoEmpty(std::string_view str, - const std::vector& vec_ch) -{ - return SplitViewNoEmpty(str, std::string_view{ vec_ch.data(), vec_ch.size() }); -} -/** -* @brief 处理子字符串(通过特定字符分割) -* @param[in] str 整个字符串 -* @param[in] vec_ch 匹配的字符 -* @note 连续匹配返回空串 -*/ -inline std::vector SplitView(std::string_view str, std::string_view vec_ch) -{ - std::vector ret; - size_t beg = 0; - size_t cur = 0; - for (; cur < str.size(); ++cur) - { - if (Any::Equal(vec_ch, str[cur])) - { - if (beg != cur) - ret.push_back({ str.data() + beg, str.data() + cur }); - else - ret.push_back({}); - beg = cur + 1; - } - } - if (beg != cur) - ret.push_back({ str.data() + beg, str.data() + cur }); - else - ret.push_back({}); - return ret; -} -inline std::vector SplitView(std::string_view str, - const std::vector& vec_ch) -{ - return SplitView(str, std::string_view{ vec_ch.data(), vec_ch.size() }); -} -/** -* @brief 分割字符串(连续跳过匹配字符) -*/ -inline std::vector SplitNoEmpty(const std::string& str, char d) -{ - std::vector ret; - split_no_empty(str, d, ret); - return ret; -} - -inline void TestSplit() -{ - std::string str0 = "0,1,2,,3"; - std::string str1 = ",0,1,2,,3,"; - std::string str2 = ",,0,1,2,,3,"; - - using namespace std::literals; - { - std::vector vec0 = SplitView(str0, ","sv); - std::vector vec1 = SplitView(str1, ","sv); - std::vector vec2 = SplitView(str2, ","sv); - - assert(vec0[0] == "0" && vec0[1] == "1" && vec0[2] == "2" && vec0[3] == "" && vec0[4] == "3"); - assert(vec1[0] == "" && vec1[1] == "0" && vec1[2] == "1" && vec1[3] == "2" && vec1[4] == "" - && vec1[5] == "3" && vec1[6] == ""); - assert(vec2[0] == "" && vec2[1] == "" && vec2[2] == "0" && vec2[3] == "1" && vec2[4] == "2" - && vec2[5] == "" && vec2[6] == "3" && vec2[7] == ""); - } - - - { - std::vector vec0 = SplitViewNoEmpty(str0, ","sv); - std::vector vec1 = SplitViewNoEmpty(str1, ","sv); - std::vector vec2 = SplitViewNoEmpty(str2, ","sv); - - assert(vec0[0] == "0" && vec0[1] == "1" && vec0[2] == "2" && vec0[3] == "3"); - assert(vec1[0] == "0" && vec1[1] == "1" && vec1[2] == "2" && vec1[3] == "3"); - assert(vec2[0] == "0" && vec2[1] == "1" && vec2[2] == "2" && vec2[3] == "3"); - } -} - -/** -* @brief 移除末尾格式,移除后不包含. -* @note 例如 "img/dog.ani.png" -> "img/dot.ani" -*/ -inline void EraseExtension(std::string& path_name) -{ - if (Erase::TailFromLast(path_name, '.')) - path_name.pop_back(); -} -[[nodiscard]] -inline std::string EraseExtension(std::string_view path_name) -{ - std::string ret = std::string{ path_name }; - EraseExtension(ret); - return ret; -} - -/** -* @brief 替换后缀格式,没有则添加 -* @param[in] fmt 格式,不含点号 -* @note 例如 "img/dog.ani.png" -> "img/dot.ani.jpg" -* @note 例如 "img/dog" -> "img/dot.jpg" -*/ -inline void ReplaceExtension(std::string& path_name, std::string_view fmt) -{ - if (Erase::TailFromLast(path_name, '.')) - { - path_name += fmt; - return; - } - path_name += "."; - path_name += std::string{ fmt }; -} -[[nodiscard]] -inline std::string ReplaceExtension(std::string_view path_name, std::string_view fmt) -{ - std::string ret = std::string{ path_name }; - ReplaceExtension(ret, fmt); - return ret; -} - -/** -* @brief 移除 路径末尾名称(返回文件所在目录,移除后末尾为/) -* @note 例如 "img/dog.ani.png" -> "img/" -*/ -inline void EraseFilename(std::string& path_name) -{ - if (!Erase::TailFromLast(path_name, '/')) - log_err0("不是一个有效路径!"); -} -[[nodiscard]] -inline std::string EraseFilename(std::string_view path_name) -{ - std::string ret = std::string{ path_name }; - EraseFilename(ret); - return ret; -} - -/** -* @brief 获取文件名不含后缀 -*/ -inline std::string GetFileStem(std::string_view path_name) -{ - std::string name{ path_name }; - Erase::HeadFromLast(name, '/'); - if (Erase::TailFromLast(name, '.')) - name.pop_back(); - return name; -} -/** -* @brief 移除路径(第一个子串) -*/ -inline std::string ErasePath(std::string_view path_name, std::string_view path) -{ - std::string ret; - Erase::HeadSub(ret, std::string{ path }); - return ret; -} - -/** -* @brief 相对路径返回真 -* @param[in] path_name 路径名字 -* @note 斜杠起头是绝对路径,代表根目录 -*/ - -inline bool IsRelativePath(std::string_view path_name) -{ - if (path_name.empty()) - return true; - - if (path_name[0] == '/') - return false; - - size_t len = (std::min)(path_name.size(), (size_t)12); - for (size_t i = 0; i < len; ++i) - { - if (path_name[i] == ':') - return false; - } - return true; -} - - -/** -* @brief 返回真实路径、资源名 -* @param[in] path_root 资源根目录 -* @param[in] path_name 绝对路径 或 资源路径(相对path_root) -* @param[out] path_real 文件路径(可直接加载) -* @param[out] res_name 资源名 -* @param[in] name 手动命名(绝对路径时传入) -* @note 由路径斜杠变为点(.),因为斜杠不能作为文件夹名称 -*/ -bool GetPathAndRes( - std::string_view path_root, std::string_view path_name, - std::string& path_real, std::string& res_name, - std::string_view name = ""); - - -/** -* @brief 资源根目录、完整相对路径, -> 解析为资源名字 -* @param[in] path_root 资源根目录 -* @param[in] path_name 完整相对路径 -*/ -std::string GetResName( - std::string_view path_root, - std::string_view path_name); - - -/** -* @brief 相对路径转换,去除./和../ -* @param[in] path_cur 当前路径 -* @param[in] path 路径 -* @note 此函数不操作文件目录,只是通过当前路径来转换 -*/ -std::string CvtRelativePath(std::string path_cur, std::string_view path); - -/** -* @brief 路径斜杠统一为/ -* @param[in] path 路径 -*/ -inline void CvtPathSeparator(std::string& path) -{ - Every::Replace(path, '\\', '/'); -} -[[nodiscard]] -inline std::string CvtPathSeparator(std::string_view path) -{ - std::string ret{ path }; - CvtPathSeparator(ret); - return ret; -} -/** -* @brief 路径斜杠统一为\,(优先使用/作为路径) -* @param[in] path 路径 -*/ -inline void CvtPathSeparatorBack(std::string& path) -{ - Every::Replace(path, '/', '\\'); -} -[[nodiscard]] -inline std::string CvtPathSeparatorBack(std::string_view path) -{ - std::string ret{ path }; - CvtPathSeparatorBack(ret); - return ret; -} -/** -* @brief 换行符统一为\n -* @param[in] str 字符串 -*/ -inline std::string CvtLineBreak(std::string_view str) -{ - std::string ret; - for (auto& iter : str) - { - if(iter == '\r') - continue; - ret.push_back(iter); - } - return ret; -} - - -/** -* @brief 是否含有数字(十进制) -*/ -inline bool HasNumber(std::string_view str) -{ - return Any::Yes(str, isdigit); -} - -/** -* @brief 是否含有字母 -*/ -inline bool HasLetter(std::string_view str) -{ - return Any::Yes(str, isalpha); -} - -/** -* @brief 解析命令行参数 -*/ -std::vector ParseCommand(std::string_view cmd); - -/** -* @brief 对2维string进行排版(保证列对齐) -* @note 例如:a, bcde, cd -*/ -template -Array FormatString2(const Array2& arr) -{ - //每一列得到一个最大宽度 - Array mul_col{}; - for (size_t j = 0; j < H; ++j) - { - for (size_t i = 0; i < W; ++i) - { - if (arr[j][i].size() > mul_col[i]) - mul_col[i] = arr[j][i].size(); - } - } - //合并每行 - Array ret; - for (size_t i = 0; i < W; ++i) - { - std::string fmt = std::string("{:<") + std::to_string(mul_col[i] + 1) + "}"; - for (size_t j = 0; j < H; ++j) - { - ret[j] += fmt::vformat(fmt, fmt::make_format_args(arr[j][i])); - } - } - return ret; -} - -/** -* @brief 对2维string进行排版(保证列对齐) -* @note 例如:a, bcde, cd -*/ -std::vector FormatString2(const Vector2& arr); - - - -//----------------------------其余范围操作封装---------------------------- -inline bool IsSub(std::string_view str, std::string_view str_sub) -{ - return Sub::IsSub(str, str_sub); -} - -inline bool IsBegin(std::string_view str, std::string_view str_sub) -{ - return Sub::IsBegin(str, str_sub); -} -inline std::string_view Range(std::string_view str, char a, char b) -{ - return Sub::Range(str, a, b); -} - -} - -} - - -namespace dl -{ - - -inline std::string to_string(const Vector2& vec2) -{ - return String::Splicing(String::FormatString2(vec2), "\n"); -} - - -//#if (DL_PLATFORM == DL_PLATFORM_WIN32) -///** -//* @brief array的format特化 -//* @note -//*/ -//template -//struct std::formatter, CharT> : std::formatter -//{ -// template -// auto parse(FormatParseContext& pc) -// { -// return pc.end(); -// } -// -// template -// auto format(array t, FormatContext& fc) -// { -// if constexpr (N == 2) -// return std::formatter::format( -// std::format("{}, {}", t[0], t[1]), fc); -// if constexpr (N == 3) -// return std::formatter::format( -// std::format("{}, {}, {}", t[0], t[1], t[2]), fc); -// if constexpr (N == 4) -// return std::formatter::format( -// std::format("{}, {}, {}, {}", t[0], t[1], t[2], t[3]), fc); -// } -//}; -//#endif -} - - - - - -namespace fmt -{ - // - template - struct formatter> - { - // 解析格式化参数(这里简化,不处理自定义格式) - constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) - { - // 检查是否有多余的格式符 - auto it = ctx.begin(); - if (it != ctx.end() && *it != '}') - throw fmt::format_error("invalid format specifier for dl::Array"); - return it; - } - - // 格式化逻辑 - template - auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) - { - return fmt::format_to(ctx.out(), "{}, {}", arr.x, arr.y); - } - }; - - // - template - struct formatter> - { - constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) - { - auto it = ctx.begin(); - if (it != ctx.end() && *it != '}') - throw fmt::format_error("invalid format specifier for dl::Array"); - return it; - } - - template - auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) - { - return fmt::format_to(ctx.out(), "{}, {}, {}", arr.x, arr.y, arr.z); - } - }; - - // - template - struct formatter> - { - constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) - { - auto it = ctx.begin(); - if (it != ctx.end() && *it != '}') - throw fmt::format_error("invalid format specifier for dl::Array"); - return it; - } - - template - auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) - { - return fmt::format_to(ctx.out(), "{}, {}, {}, {}", arr.x, arr.y, arr.z, arr.w); - } - }; - // - template - struct formatter> - { - // 解析格式化参数(这里简化,不处理自定义格式) - constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) - { - // 检查是否有多余的格式符 - auto it = ctx.begin(); - if (it != ctx.end() && *it != '}') - throw fmt::format_error("invalid format specifier for dl::Array"); - return it; - } - - // 格式化逻辑 - template - auto format(const dl::StringN& str, FormatContext& ctx) const -> decltype(ctx.out()) - { - return fmt::format_to(ctx.out(), "{}", str.c_str()); - } - }; +/** +* @file dl_string.h +* @brief 字符串相关 +* +* +* @version 1.0 +* @author lveyou +* @date 23-06-23 +* +* @note vs设置多字节编码,并且定义utf-8 +* @note 字节流请优先使用Buffer类 +* +* @note string的size和length相同。我们需要保证结尾不包含0的 +* @note 现在字符串统一使用基于string的 utf-8编码,在需要对字符拆分处理时再转换到utf-32编码 +* @note wstring_convert在C++17已经弃用,使用iconv来转换编码,在CodeCvt文件 +* +* @note to_string转换为字符串, +* @note toXxx作为复杂类型转换,format多个变量时使用 +* @note format非编译期时使用:vformat(fmt, std::make_format_args(v)); +*/ +#pragma once +#include +#include +#include +#include + +#include + +#include "memory/dl_code_cvt.h" +#include "dl_range.h" +#include "math/dl_algorithm.h" +#include "io/dl_log.h" +#include "base/dl_type_def.h" +#include "base/dl_vector2.h" +#include "base/dl_array2.h" +#include "memory/dl_buffer.h" + +namespace dl +{ + + +// unordered_map支持 string_view +struct string_hash +{ + using hash_type = std::hash; + using is_transparent = void; + + std::size_t operator()(const char* str) const { return hash_type{}(str); } + std::size_t operator()(std::string_view str) const { return hash_type{}(str); } + std::size_t operator()(std::string const& str) const { return hash_type{}(str); } +}; + +//-----------------------------字符串连接------------------- +inline std::string& operator+=(std::string& a, std::string_view b) +{ + a.append(b); + return a; +} +inline std::string operator+(const std::string& a, std::string_view b) +{ + std::string ret{ a }; + return ret += b; +} +inline std::string operator+(std::string_view a, std::string_view b) +{ + std::string ret{ a }; + return ret += b; +} +/** +* @brief to_string包装 +* @note 小数默认两位 +*/ +template +std::string to_string(T v) +{ + if constexpr (std::is_floating_point_v) + { + return fmt::format("{:.2f}", v); + } + else + return std::to_string(v); +} + +/** +* @brief array通用to_string +*/ +template +std::string to_string(const std::array& arr, std::string_view delimiter = ", ") +{ + static_assert(N != 0); + std::string ret; + for (size_t i = 0; i < N - 1; ++i) + { + ret += dl::to_string(arr[i]); + ret += delimiter; + } + ret += dl::to_string(arr[N - 1]); + return ret; +} +template +std::string to_string(const Array& arr, std::string_view delimiter = ", ") +{ + static_assert(N != 0); + std::string ret; + for (size_t i = 0; i < N - 1; ++i) + { + ret += dl::to_string(arr[i]); + ret += delimiter; + } + ret += dl::to_string(arr[N - 1]); + return ret; +} +template +std::string to_string(const ArrayS2& arr, std::string_view delimiter = ", ") +{ + static_assert(N != 0); + std::string ret; + for (size_t i = 0; i < N - 1; ++i) + { + ret += dl::to_string(arr.x[i]); + ret += delimiter; + ret += dl::to_string(arr.y[i]); + ret += delimiter; + } + ret += dl::to_string(arr.x[N - 1]); + ret += delimiter; + ret += dl::to_string(arr.y[N - 1]); + return ret; +} +/** +* @brief vector通用to_string +*/ +template +std::string to_string_ex(const std::vector& vec, std::string_view delimiter = ", ") +{ + if (vec.empty()) + return {}; + std::string ret; + for (size_t i = 0; i < vec.size() - 1; ++i) + { + ret += dl::to_string(vec[i]); + ret += delimiter; + } + ret += dl::to_string(vec[vec.size() - 1]); + return ret; +} + +//! 错误码信息 +std::string to_string(std::error_code code); + +//! 异常信息 +std::string to_string(std::exception& e); + +/** +* @brief buf转为utf8字符串(不进行检查) +*/ +template<> +std::string to_string(BufferView buf); +template<> +inline std::string to_string(Buffer buf) +{ + return to_string(BufferView{ buf }); +} + +/** +* @brief buf转为utf8字符串(进行检查) +*/ +std::string to_string_check(BufferView buf, bool tips = true); + +/** +* @brief buf转为16进制字符串 +*/ +std::string to_string_hex(BufferView buf, bool add_tag = false); + +/** +* @brief buf转为16进制字符串 +*/ +template +std::string to_string_hex(std::array buf, bool add_tag = false) +{ + return to_string_hex(std::span(buf), add_tag); +} + +/** +* @brief buf转为字符串,若不为utf8则转为16进制 +*/ +std::string to_string_auto(BufferView buf, bool add_tag = false); + +enum class StringType +{ + NORMAL, + INTGER, + FLOAT +}; +//! 字符串操作 +namespace String +{ + + /** + * @brief 字符串 -> Float + * @note 失败返回0 + */ + inline Float toFloat(std::string_view str, Float default_v = 0) + { +#if DL_PLATFORM != DL_PLATFORM_APPLE + std::from_chars(str.data(), str.data() + str.size(), default_v); + return default_v; +#else + if (str.empty()) + return default_v; + + if constexpr (std::is_same_v) + { + try + { + return std::stof(str.data()); + } + catch (...) + { + return default_v; + } + } + else if constexpr (std::is_same_v) + { + try + { + return std::stod(str.data()); + } + catch (...) + { + return default_v; + } + } +#endif + } + /** + * @brief 转为整数,失败返回设定的默认值 + * @note 不建议依赖默认值,会增加代码复杂度 + */ + inline int toInt(std::string_view str, int default_v = 0) + { +#if DL_PLATFORM != DL_PLATFORM_APPLE + std::from_chars(str.data(), str.data() + str.size(), default_v); + return default_v; +#else + try + { + return std::stoi(str.data()); + } + catch (...) + { + return default_v; + } +#endif + } + /** + * @brief 转为整数,失败返回设定的默认值 + * @note 不建议依赖默认值,会增加代码复杂度 + */ + inline int64_t toInt64(std::string_view str, int64_t default_v = 0) + { +#if DL_PLATFORM != DL_PLATFORM_APPLE + std::from_chars(str.data(), str.data() + str.size(), default_v); + return default_v; +#else + try + { + return std::stoll(str.data()); + } + catch (...) + { + return default_v; + } +#endif + } + /** + * @brief 转为整数,失败不修改原值 + */ + inline bool getInt(std::string_view str, int& ret) + { + +#if DL_PLATFORM != DL_PLATFORM_APPLE + std::from_chars_result r = std::from_chars(str.data(), str.data() + str.size(), ret); + return r.ec == std::errc(); +#else + try + { + ret = std::stoi(str.data()); + } + catch (...) + { + return false; + } + return true; +#endif + } + +/** +* @brief 字符串 -> Point +*/ +template +Array toPoint(std::string_view str, char d = ',') +{ + std::vector vec; + split(str, d, vec); + if (vec.size() == 0) + { + log_warn("分割后数量为0!"); + return {}; + } + else if (vec.size() == 1) + { + log_warn("分割后数量为1!"); + return { toInt(vec[0]) , 0}; + } + return { toInt(vec[0]), toInt(vec[1]) }; +} +/** +* @brief 字符串 -> Position +*/ +template +Array toPosition(std::string_view str, char d = ',') +{ + std::vector vec; + split(str, d, vec); + if (vec.size() == 0) + { + log_warn("分割后数量为0!"); + return {}; + } + else if (vec.size() == 1) + { + log_warn("分割后数量为1!"); + return { toFloat(vec[0]) , 0 }; + } + return { toFloat(vec[0]), toFloat(vec[1]) }; +} + +inline Point2 toPoint2(std::string_view str, char d = ',') +{ + return toPoint<2>(str, d); +} +inline Position toPosition2(std::string_view str, char d = ',') +{ + return toPosition<2>(str, d); +} + +/** +* @brief 返回字符串类型 +*/ +constexpr StringType GetType(std::string_view str) +{ + bool has_dot = false; + for (size_t i = 0; i < str.size(); ++i) + { + const char& ch = str[i]; + if (std::isdigit(ch)) + continue; + else if (i == 0 && (ch == '+' || ch == '-')) + continue; + else if (!has_dot && ch == '.') + { + has_dot = true; + continue; + } + else + return StringType::NORMAL; + } + return has_dot ? StringType::FLOAT : StringType::INTGER; +} +/** +* @brief 两侧添加引号 +*/ +inline std::string AddQuotes(std::string_view str, char quotes = '\"') +{ + std::string ret; + ret.reserve(str.size() + 2); + ret += quotes; + ret += str; + ret += quotes; + return ret; +} +/** +* @brief 获取宽字符宽度(控制台显示优化) +*/ +size_t Wcwidth(wchar_t ch); +/** +* @brief 多行文本填充字符至一样宽(控制台显示优化) +* @note 假设为等宽字符,中文算2个 +*/ +std::string FillEndl(std::string_view str, char ch = ' '); +/** +* @brief 返回不能作为文件名的字符 +*/ +constexpr std::string_view GetNotFileName() +{ + return R"(<>/\|:"*?)"; +} + +/** +* @brief 移除不能作为文件名的字符 +*/ +inline void EraseNotFileName(std::string& name) +{ + Erase::Match(name, std::string{ String::GetNotFileName() }); +} + +/** +* @brief 将字符串字母变为小写 +*/ +inline void ToLower(std::string& str) +{ + std::transform(str.begin(), str.end(), str.begin(), ::tolower); +} + +/** +* @brief 将字符串字母变为小写 +*/ +inline std::string ToLower(const std::string& str) +{ + std::string ret = str; + std::transform(ret.begin(), ret.end(), ret.begin(), ::tolower); + return ret; +} +/** +* @brief 将字符串字母变为大写 +*/ +inline void ToUpper(std::string& str) +{ + std::transform(str.begin(), str.end(), str.begin(), ::toupper); +} +/** +* @brief 将字符串字母变为大写 +*/ +inline std::string ToUpper(std::string_view str) +{ + std::string ret{ str }; + ToUpper(ret); + return ret; +} +/** +* @brief 字符串相等,并且不区分大小写 +*/ +inline bool EqualToLower(std::string_view a, std::string_view b) +{ + if (a.size() != b.size()) + return false; + if (a.empty()) + return true; + for (size_t i = 0; i < a.size(); ++i) + { + if (std::tolower(a[i]) != std::tolower(b[i])) + return false; + } + return true; +} + +/** +* @brief 拼接字符串 +*/ +inline std::string Splicing(const std::vector& vec, + std::string_view delimiter = ", ", std::string_view end = "") +{ + if (vec.empty()) + return {}; + if (vec.size() == 1) + return vec[0] + end; + + std::string ret; + for (size_t i = 0; i < vec.size() - 1; ++i) + { + ret += vec[i]; + ret += delimiter; + } + ret += vec[vec.size() - 1]; + ret += end; + return ret; +} +/** +* @brief 字符串为空白字符,一般意义上(\n\t空格) +*/ +inline bool IsBlank(char ch) +{ + return ch == ' ' + || ch == '\n' + || ch == '\t'; +} + +/** +* @brief 字符串为空白(全为\n\t空格) +*/ +inline bool IsBlank(std::string_view str) +{ + for (char ch : str) + { + if (!IsBlank(ch)) + return false; + } + return true; +} + +/** +* @brief 字符串删除指定字符 +* @note 出于效率和方便使用,不使用Erase的函数 +*/ +inline std::string EraseCharAll(std::string_view str, std::string_view vec_char) +{ + std::string ret; + for (auto& iter : str) + { + if (Every::NotEqual(vec_char, iter)) + ret.push_back(iter); + } + return ret; +} +/** +* @brief 字符串删除指定字符,从前面N个 +* @note 出于效率和方便使用,不使用Erase的函数 +*/ +inline std::string EraseCharN(std::string_view str, std::string_view vec_char, size_t n = 1) +{ + std::string ret; + + for (auto& iter : str) + { + if (n && Any::Equal(vec_char, iter)) + { + --n; + continue; + } + else + ret.push_back(iter); + } + return ret; +} +/** +* @brief 字符串删除指定字符,从头部删除,直到不满足条件 +* @note 出于效率和方便使用,不使用Erase的函数 +*/ +inline std::string EraseCharHead(std::string_view str, std::string_view vec_char) +{ + std::string ret; + + bool check = true; + for (auto& iter : str) + { + if (check) + { + if (Any::Equal(vec_char, iter)) + ;// 需要删除,仍需判断 + else + { + check = false; + ret.push_back(iter); + } + } + else + ret.push_back(iter); + } + return ret; +} +/** +* @brief 字符串删除空字符 +*/ +inline std::string EraseBlank(std::string_view str) +{ + return EraseCharAll(str, " \t\n"); +} +/** +* @brief 字符串删除空字符N个,从前面 +*/ +inline std::string EraseBlankN(std::string_view str, size_t n = 1) +{ + return EraseCharN(str, " \t\n", n); +} +/** +* @brief 字符串删除空字符 +*/ +inline std::string EraseBlankHead(std::string_view str) +{ + return EraseCharHead(str, " \t\n"); +} + +/** +* @brief wchar_t字符返回utf8 +*/ +inline std::string GetUtf8ByWchar(wchar_t wc, size_t offset = 0) +{ + // 某些平台wchar_t是4字节,必须使用u32string + std::u32string s{ (char32_t)(wc + offset) }; + + return CodeCvt::Utf32ToUtf8(s); +} + + +/** + * @brief 返回ASCII码表,通过Text直接显示 +*/ +//string GetAscii() +//{ +// string str_ascii = format("ascii表:\n0 -> /0[t_8]"); +// for (char ch = 1; ch < 128; ++ch) +// { +// if (ch == '\n') +// str_ascii += format("{} -> {}[t_8]", to_string(ch), "/n"); +// else if (ch == '\t') +// str_ascii += format("{} -> {}[t_8]", to_string(ch), "/t"); +// else if (ch == '[') +// str_ascii += format("{} -> {}[t_8]", to_string(ch), "[l]"); +// else if (ch == ']') +// str_ascii += format("{} -> {}[t_8]", to_string(ch), "[r]"); +// else +// str_ascii += format("{} -> {}[t_8]", to_string(ch), char(ch)); +// +// if ((ch - 1) % 6 == 0) +// str_ascii += "\n"; +// } +// return str_ascii; +//} + +/** +* @brief pintf替代品,一般情况不使用 +*/ +std::string Sprintf(const char* format, ...); + +/** +* @brief 将整数转为千位分隔符的字符串。 +*/ +template +std::string SplitIntegerToThousands(T integer) +{ + return r_insert_per_num(to_string(integer), ',', 3); +} + +/** +* @brief 分割字符串 +*/ +inline std::vector Split(const std::string& str, char d) +{ + std::vector ret; + split(str, d, ret); + return ret; +} +inline std::vector Split(std::string_view str, char d) +{ + std::vector ret; + split(str, d, ret); + return ret; +} + +/** +* @brief 分割字符串 +*/ +inline std::vector Split(const std::string& str, const std::string& d) +{ + std::vector ret; + split_sub(str, d, ret); + return ret; +} +inline std::vector Split(std::string_view str, std::string_view d) +{ + std::vector ret; + split_sub(str, d, ret); + return ret; +} + +/** +* @brief 处理子字符串(通过特定字符分割) +* @param[in] str 整个字符串 +* @param[in] vec_ch 匹配的字符 +* @note 效率更高,连续匹配不会返回空串 +*/ +inline std::vector SplitViewNoEmpty(std::string_view str, std::string_view vec_ch) +{ + std::vector ret; + size_t beg = 0; + size_t cur = 0; + for (; cur < str.size(); ++cur) + { + if (Any::Equal(vec_ch, str[cur])) + { + if (beg != cur) + ret.push_back({ str.data() + beg, str.data() + cur }); + beg = cur + 1; + } + } + if (beg != cur) + ret.push_back({ str.data() + beg, str.data() + cur }); + return ret; +} +inline std::vector SplitViewNoEmpty(std::string_view str, + const std::vector& vec_ch) +{ + return SplitViewNoEmpty(str, std::string_view{ vec_ch.data(), vec_ch.size() }); +} +/** +* @brief 处理子字符串(通过特定字符分割) +* @param[in] str 整个字符串 +* @param[in] vec_ch 匹配的字符 +* @note 连续匹配返回空串 +*/ +inline std::vector SplitView(std::string_view str, std::string_view vec_ch) +{ + std::vector ret; + size_t beg = 0; + size_t cur = 0; + for (; cur < str.size(); ++cur) + { + if (Any::Equal(vec_ch, str[cur])) + { + if (beg != cur) + ret.push_back({ str.data() + beg, str.data() + cur }); + else + ret.push_back({}); + beg = cur + 1; + } + } + if (beg != cur) + ret.push_back({ str.data() + beg, str.data() + cur }); + else + ret.push_back({}); + return ret; +} +inline std::vector SplitView(std::string_view str, + const std::vector& vec_ch) +{ + return SplitView(str, std::string_view{ vec_ch.data(), vec_ch.size() }); +} +/** +* @brief 分割字符串(连续跳过匹配字符) +*/ +inline std::vector SplitNoEmpty(const std::string& str, char d) +{ + std::vector ret; + split_no_empty(str, d, ret); + return ret; +} + +inline void TestSplit() +{ + std::string str0 = "0,1,2,,3"; + std::string str1 = ",0,1,2,,3,"; + std::string str2 = ",,0,1,2,,3,"; + + using namespace std::literals; + { + std::vector vec0 = SplitView(str0, ","sv); + std::vector vec1 = SplitView(str1, ","sv); + std::vector vec2 = SplitView(str2, ","sv); + + assert(vec0[0] == "0" && vec0[1] == "1" && vec0[2] == "2" && vec0[3] == "" && vec0[4] == "3"); + assert(vec1[0] == "" && vec1[1] == "0" && vec1[2] == "1" && vec1[3] == "2" && vec1[4] == "" + && vec1[5] == "3" && vec1[6] == ""); + assert(vec2[0] == "" && vec2[1] == "" && vec2[2] == "0" && vec2[3] == "1" && vec2[4] == "2" + && vec2[5] == "" && vec2[6] == "3" && vec2[7] == ""); + } + + + { + std::vector vec0 = SplitViewNoEmpty(str0, ","sv); + std::vector vec1 = SplitViewNoEmpty(str1, ","sv); + std::vector vec2 = SplitViewNoEmpty(str2, ","sv); + + assert(vec0[0] == "0" && vec0[1] == "1" && vec0[2] == "2" && vec0[3] == "3"); + assert(vec1[0] == "0" && vec1[1] == "1" && vec1[2] == "2" && vec1[3] == "3"); + assert(vec2[0] == "0" && vec2[1] == "1" && vec2[2] == "2" && vec2[3] == "3"); + } +} + +/** +* @brief 移除末尾格式,移除后不包含. +* @note 例如 "img/dog.ani.png" -> "img/dot.ani" +*/ +inline void EraseExtension(std::string& path_name) +{ + if (Erase::TailFromLast(path_name, '.')) + path_name.pop_back(); +} +[[nodiscard]] +inline std::string EraseExtension(std::string_view path_name) +{ + std::string ret = std::string{ path_name }; + EraseExtension(ret); + return ret; +} + +/** +* @brief 替换后缀格式,没有则添加 +* @param[in] fmt 格式,不含点号 +* @note 例如 "img/dog.ani.png" -> "img/dot.ani.jpg" +* @note 例如 "img/dog" -> "img/dot.jpg" +*/ +inline void ReplaceExtension(std::string& path_name, std::string_view fmt) +{ + if (Erase::TailFromLast(path_name, '.')) + { + path_name += fmt; + return; + } + path_name += "."; + path_name += std::string{ fmt }; +} +[[nodiscard]] +inline std::string ReplaceExtension(std::string_view path_name, std::string_view fmt) +{ + std::string ret = std::string{ path_name }; + ReplaceExtension(ret, fmt); + return ret; +} + +/** +* @brief 移除 路径末尾名称(返回文件所在目录,移除后末尾为/) +* @note 例如 "img/dog.ani.png" -> "img/" +*/ +inline void EraseFilename(std::string& path_name) +{ + if (!Erase::TailFromLast(path_name, '/')) + log_err0("不是一个有效路径!"); +} +[[nodiscard]] +inline std::string EraseFilename(std::string_view path_name) +{ + std::string ret = std::string{ path_name }; + EraseFilename(ret); + return ret; +} + +/** +* @brief 获取文件名不含后缀 +*/ +inline std::string GetFileStem(std::string_view path_name) +{ + std::string name{ path_name }; + Erase::HeadFromLast(name, '/'); + if (Erase::TailFromLast(name, '.')) + name.pop_back(); + return name; +} +/** +* @brief 移除路径(第一个子串) +*/ +inline std::string ErasePath(std::string_view path_name, std::string_view path) +{ + std::string ret; + Erase::HeadSub(ret, std::string{ path }); + return ret; +} + +/** +* @brief 相对路径返回真 +* @param[in] path_name 路径名字 +* @note 斜杠起头是绝对路径,代表根目录 +*/ + +inline bool IsRelativePath(std::string_view path_name) +{ + if (path_name.empty()) + return true; + + if (path_name[0] == '/') + return false; + + size_t len = (std::min)(path_name.size(), (size_t)12); + for (size_t i = 0; i < len; ++i) + { + if (path_name[i] == ':') + return false; + } + return true; +} + + +/** +* @brief 返回真实路径、资源名 +* @param[in] path_root 资源根目录 +* @param[in] path_name 绝对路径 或 资源路径(相对path_root) +* @param[out] path_real 文件路径(可直接加载) +* @param[out] res_name 资源名 +* @param[in] name 手动命名(绝对路径时传入) +* @note 由路径斜杠变为点(.),因为斜杠不能作为文件夹名称 +*/ +bool GetPathAndRes( + std::string_view path_root, std::string_view path_name, + std::string& path_real, std::string& res_name, + std::string_view name = ""); + + +/** +* @brief 资源根目录、完整相对路径, -> 解析为资源名字 +* @param[in] path_root 资源根目录 +* @param[in] path_name 完整相对路径 +*/ +std::string GetResName( + std::string_view path_root, + std::string_view path_name); + + +/** +* @brief 相对路径转换,去除./和../ +* @param[in] path_cur 当前路径 +* @param[in] path 路径 +* @note 此函数不操作文件目录,只是通过当前路径来转换 +*/ +std::string CvtRelativePath(std::string path_cur, std::string_view path); + +/** +* @brief 路径斜杠统一为/ +* @param[in] path 路径 +*/ +inline void CvtPathSeparator(std::string& path) +{ + Every::Replace(path, '\\', '/'); +} +[[nodiscard]] +inline std::string CvtPathSeparator(std::string_view path) +{ + std::string ret{ path }; + CvtPathSeparator(ret); + return ret; +} +/** +* @brief 路径斜杠统一为\,(优先使用/作为路径) +* @param[in] path 路径 +*/ +inline void CvtPathSeparatorBack(std::string& path) +{ + Every::Replace(path, '/', '\\'); +} +[[nodiscard]] +inline std::string CvtPathSeparatorBack(std::string_view path) +{ + std::string ret{ path }; + CvtPathSeparatorBack(ret); + return ret; +} +/** +* @brief 换行符统一为\n +* @param[in] str 字符串 +*/ +inline std::string CvtLineBreak(std::string_view str) +{ + std::string ret; + for (auto& iter : str) + { + if(iter == '\r') + continue; + ret.push_back(iter); + } + return ret; +} + + +/** +* @brief 是否含有数字(十进制) +*/ +inline bool HasNumber(std::string_view str) +{ + return Any::Yes(str, isdigit); +} + +/** +* @brief 是否含有字母 +*/ +inline bool HasLetter(std::string_view str) +{ + return Any::Yes(str, isalpha); +} + +/** +* @brief 解析命令行参数 +*/ +std::vector ParseCommand(std::string_view cmd); + +/** +* @brief 对2维string进行排版(保证列对齐) +* @note 例如:a, bcde, cd +*/ +template +Array FormatString2(const Array2& arr) +{ + //每一列得到一个最大宽度 + Array mul_col{}; + for (size_t j = 0; j < H; ++j) + { + for (size_t i = 0; i < W; ++i) + { + if (arr[j][i].size() > mul_col[i]) + mul_col[i] = arr[j][i].size(); + } + } + //合并每行 + Array ret; + for (size_t i = 0; i < W; ++i) + { + std::string fmt = std::string("{:<") + std::to_string(mul_col[i] + 1) + "}"; + for (size_t j = 0; j < H; ++j) + { + ret[j] += fmt::vformat(fmt, fmt::make_format_args(arr[j][i])); + } + } + return ret; +} + +/** +* @brief 对2维string进行排版(保证列对齐) +* @note 例如:a, bcde, cd +*/ +std::vector FormatString2(const Vector2& arr); + + + +//----------------------------其余范围操作封装---------------------------- +inline bool IsSub(std::string_view str, std::string_view str_sub) +{ + return Sub::IsSub(str, str_sub); +} + +inline bool IsBegin(std::string_view str, std::string_view str_sub) +{ + return Sub::IsBegin(str, str_sub); +} +inline std::string_view Range(std::string_view str, char a, char b) +{ + return Sub::Range(str, a, b); +} + +} + +} + + +namespace dl +{ + + +inline std::string to_string(const Vector2& vec2) +{ + return String::Splicing(String::FormatString2(vec2), "\n"); +} + + +//#if (DL_PLATFORM == DL_PLATFORM_WIN32) +///** +//* @brief array的format特化 +//* @note +//*/ +//template +//struct std::formatter, CharT> : std::formatter +//{ +// template +// auto parse(FormatParseContext& pc) +// { +// return pc.end(); +// } +// +// template +// auto format(array t, FormatContext& fc) +// { +// if constexpr (N == 2) +// return std::formatter::format( +// std::format("{}, {}", t[0], t[1]), fc); +// if constexpr (N == 3) +// return std::formatter::format( +// std::format("{}, {}, {}", t[0], t[1], t[2]), fc); +// if constexpr (N == 4) +// return std::formatter::format( +// std::format("{}, {}, {}, {}", t[0], t[1], t[2], t[3]), fc); +// } +//}; +//#endif +} + + + + + +namespace fmt +{ + // + template + struct formatter> + { + // 解析格式化参数(这里简化,不处理自定义格式) + constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) + { + // 检查是否有多余的格式符 + auto it = ctx.begin(); + if (it != ctx.end() && *it != '}') + throw fmt::format_error("invalid format specifier for dl::Array"); + return it; + } + + // 格式化逻辑 + template + auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::format_to(ctx.out(), "{}, {}", arr.x, arr.y); + } + }; + + // + template + struct formatter> + { + constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) + { + auto it = ctx.begin(); + if (it != ctx.end() && *it != '}') + throw fmt::format_error("invalid format specifier for dl::Array"); + return it; + } + + template + auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::format_to(ctx.out(), "{}, {}, {}", arr.x, arr.y, arr.z); + } + }; + + // + template + struct formatter> + { + constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) + { + auto it = ctx.begin(); + if (it != ctx.end() && *it != '}') + throw fmt::format_error("invalid format specifier for dl::Array"); + return it; + } + + template + auto format(const dl::Array& arr, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::format_to(ctx.out(), "{}, {}, {}, {}", arr.x, arr.y, arr.z, arr.w); + } + }; + // + template + struct formatter> + { + // 解析格式化参数(这里简化,不处理自定义格式) + constexpr auto parse(fmt::format_parse_context& ctx) -> decltype(ctx.begin()) + { + // 检查是否有多余的格式符 + auto it = ctx.begin(); + if (it != ctx.end() && *it != '}') + throw fmt::format_error("invalid format specifier for dl::Array"); + return it; + } + + // 格式化逻辑 + template + auto format(const dl::StringN& str, FormatContext& ctx) const -> decltype(ctx.out()) + { + return fmt::format_to(ctx.out(), "{}", str.c_str()); + } + }; } \ No newline at end of file diff --git a/dl/io/dl_file.cpp b/dl/io/dl_file.cpp index 0e434151..62fdd6c5 100644 --- a/dl/io/dl_file.cpp +++ b/dl/io/dl_file.cpp @@ -843,6 +843,21 @@ struct FileImp } }; #endif + +#if DL_PLATFORM == DL_PLATFORM_APPLE +struct FileImp +{ + std::string _pathFilesDir; + std::string _pathExternalFilesDir; + std::string _pathExternalStorageDirectory; + void Build() + { + _pathFilesDir = "/Users/zego/code/dl/out/"; + _pathExternalFilesDir = _pathFilesDir; + _pathExternalStorageDirectory = _pathFilesDir; + } +}; +#endif FileImp g_fileImp; void InitFileSystem() diff --git a/dl/system/dl_infoware.h b/dl/system/dl_infoware.h index 5701bb16..d7eb5974 100644 --- a/dl/system/dl_infoware.h +++ b/dl/system/dl_infoware.h @@ -12,7 +12,7 @@ #pragma once #include "dl_platform.h" -#if DL_PLATFORM != DL_PLATFORM_ANDROID +#if (DL_PLATFORM != DL_PLATFORM_ANDROID && DL_PLATFORM != DL_PLATFORM_APPLE) #include #endif diff --git a/dl/system/dl_platform.h b/dl/system/dl_platform.h index 140edd99..e30bb6d5 100644 --- a/dl/system/dl_platform.h +++ b/dl/system/dl_platform.h @@ -15,6 +15,7 @@ #define DL_PLATFORM_WIN32 1 #define DL_PLATFORM_LINUX 2 #define DL_PLATFORM_ANDROID 3 +#define DL_PLATFORM_APPLE 4 #define DL_PLATFORM DL_PLATFORM_ERROR @@ -33,6 +34,11 @@ #define DL_PLATFORM DL_PLATFORM_ANDROID #endif +#ifdef __APPLE__ +#undef DL_PLATFORM +#define DL_PLATFORM DL_PLATFORM_APPLE +#endif + //! 是否64位 consteval bool is_x64() { From f07f7d3f9dbb32aa4dc53d4b00fda63caca71b0d Mon Sep 17 00:00:00 2001 From: ablehe Date: Sun, 15 Mar 2026 13:51:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=20mac?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 10 ++++++++-- dl/CMakeLists.txt | 15 ++++++++++---- dl/io/dl_net.cpp | 1 - dl/io/dl_net.h | 2 +- dl/system/dl_infoware.cpp | 2 +- dl/system/dl_infoware.h | 3 ++- project/dl_chess | 2 +- project/dl_test/game_sudo.cpp | 24 +++++++++++------------ third/asio/include/asio/detail/config.hpp | 4 ++-- 9 files changed, 38 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f34d90c6..1945a57c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,9 @@ endif() # 使用C++最新标准 set(CMAKE_CXX_STANDARD 23) - +if (APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -lc++abi") +endif() # CentOs无默认源,暂还是使用stdlibc++ # Clang 使用 libc++ 标准库 #if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -89,6 +91,9 @@ endif() if (CMAKE_SYSTEM_NAME MATCHES "Android") option(ALSOFT_INSTALL "解决安卓openal报错" OFF) endif() +if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +option(ALSOFT_INSTALL "解决安卓openal报错" OFF) +endif() if(DEFINED CURL_USE_OPENSSL) unset(CURL_USE_OPENSSL CACHE) @@ -174,10 +179,11 @@ message("------------------lua 脚本语言库-----------") add_subdirectory ("third/lua") add_subdirectory ("third/LuaBridge3") message("------------------infoware 硬件信息库-----------") -if (NOT CMAKE_SYSTEM_NAME MATCHES "Android") +if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "AMD64") set(INFOWARE_PCI_IDS_PATH ${CMAKE_SOURCE_DIR}/third/infoware/pci.ids CACHE FILEPATH "使用本地piiids" FORCE) add_subdirectory ("third/infoware") endif() + message("------------------wcwidth 字符宽度检测-----------") add_subdirectory ("third/wcwidth") message("------------------simde 向量化计算-----------") diff --git a/dl/CMakeLists.txt b/dl/CMakeLists.txt index ec215bb3..d74db56f 100644 --- a/dl/CMakeLists.txt +++ b/dl/CMakeLists.txt @@ -138,6 +138,10 @@ endif() elseif(CMAKE_SYSTEM_NAME MATCHES "Android") #include_directories(${CMAKE_SOURCE_DIR}/third/libiconv/include) #target_link_libraries(${PROJECT_NAME} PRIVATE Libiconv) +elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") +# 查找 iconv 库(兼容系统/新版) +find_library(ICONV_LIBRARY NAMES iconv libiconv) +target_link_libraries(${PROJECT_NAME} PRIVATE ${ICONV_LIBRARY}) endif() if (NOT DL_DISABLE_RENDER) @@ -159,7 +163,8 @@ if (NOT DL_DISABLE_AUDIO) if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux") target_link_libraries(${PROJECT_NAME} PRIVATE OpenAL) else() - target_link_libraries(${PROJECT_NAME} PRIVATE libopenal.so) + find_package(OpenAL REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE OpenAL) endif() endif() #rtmidi @@ -247,9 +252,11 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows") Crypt32.lib) endif() endif() -elseif (CMAKE_SYSTEM_NAME MATCHES "Linux") - target_link_libraries(${PROJECT_NAME} PRIVATE libcrypto.so) - target_link_libraries(${PROJECT_NAME} PRIVATE libssl.so) +elseif (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Darwin") + find_package(OpenSSL REQUIRED) + # 链接 libcrypto + target_include_directories(${PROJECT_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR}) + target_link_libraries(${PROJECT_NAME} PRIVATE ${OPENSSL_CRYPTO_LIBRARY}) # 显式链接 libcrypto endif() if (APPLE) # Apple Silicon diff --git a/dl/io/dl_net.cpp b/dl/io/dl_net.cpp index 6908d2a0..c1e34723 100644 --- a/dl/io/dl_net.cpp +++ b/dl/io/dl_net.cpp @@ -3,7 +3,6 @@ #include #include "system/dl_time.h" - namespace dl { Network* g_net; diff --git a/dl/io/dl_net.h b/dl/io/dl_net.h index b6fbda0c..265c4116 100644 --- a/dl/io/dl_net.h +++ b/dl/io/dl_net.h @@ -202,7 +202,7 @@ public: void SetCbDisconnect(CbDisconnect func); - template + template, bool> = true> void Send(int sokect_id, E msg_id, const T& a) { BufferView buf = CreateBufferView(a); diff --git a/dl/system/dl_infoware.cpp b/dl/system/dl_infoware.cpp index fcfa5e46..1796f611 100644 --- a/dl/system/dl_infoware.cpp +++ b/dl/system/dl_infoware.cpp @@ -5,7 +5,7 @@ #include "io/dl_log.h" #include "base/dl_string.h" -#if DL_PLATFORM != DL_PLATFORM_ANDROID +#if DL_PLATFORM != DL_PLATFORM_ANDROID && DL_PLATFORM != DL_PLATFORM_APPLE namespace dl::Infoware { diff --git a/dl/system/dl_infoware.h b/dl/system/dl_infoware.h index d7eb5974..ffa8dca0 100644 --- a/dl/system/dl_infoware.h +++ b/dl/system/dl_infoware.h @@ -12,7 +12,8 @@ #pragma once #include "dl_platform.h" -#if (DL_PLATFORM != DL_PLATFORM_ANDROID && DL_PLATFORM != DL_PLATFORM_APPLE) +#include +#ifdef __x86_64__ #include #endif diff --git a/project/dl_chess b/project/dl_chess index 1e330db0..cabf69fa 160000 --- a/project/dl_chess +++ b/project/dl_chess @@ -1 +1 @@ -Subproject commit 1e330db01635191b0bac787ed4750bd3c29d2bd1 +Subproject commit cabf69fab2124db23cc5c55cf30035461b2b404e diff --git a/project/dl_test/game_sudo.cpp b/project/dl_test/game_sudo.cpp index dccc2093..7832b384 100644 --- a/project/dl_test/game_sudo.cpp +++ b/project/dl_test/game_sudo.cpp @@ -21,18 +21,18 @@ constexpr std::array TIP_LV2 = { "不要乱点!" }; -constexpr Position POS_LT = { 20.0, 20.0 }; -constexpr Float LENGTH_GRID = 60; -constexpr Position SIZE_GRID = toLonger(LENGTH_GRID); -constexpr Position SIZE_BOARD = SIZE_GRID * 9.0_f; -constexpr Float WIDTH_GRID_LINE_0 = 4; -constexpr Float WIDTH_GRID_LINE_1 = 2; -constexpr float ORDER_BOARD = 0.5f; -constexpr float ORDER_GRID_LINE_0 = Math::OffsetOrder(ORDER_BOARD, -1); -constexpr float ORDER_GRID_LINE_1 = Math::OffsetOrder(ORDER_BOARD, -2); -constexpr float ORDER_NUMBER = Math::OffsetOrder(ORDER_BOARD, -4); -constexpr float ORDER_MOUSE = Math::OffsetOrder(ORDER_BOARD, -5); -constexpr float ORDER_MOUSE_TEXT = Math::OffsetOrder(ORDER_BOARD, -6); +const Position POS_LT = { 20.0, 20.0 }; +const Float LENGTH_GRID = 60; +const Position SIZE_GRID = toLonger(LENGTH_GRID); +const Position SIZE_BOARD = SIZE_GRID * 9.0_f; +const Float WIDTH_GRID_LINE_0 = 4; +const Float WIDTH_GRID_LINE_1 = 2; +const float ORDER_BOARD = 0.5f; +const float ORDER_GRID_LINE_0 = Math::OffsetOrder(ORDER_BOARD, -1); +const float ORDER_GRID_LINE_1 = Math::OffsetOrder(ORDER_BOARD, -2); +const float ORDER_NUMBER = Math::OffsetOrder(ORDER_BOARD, -4); +const float ORDER_MOUSE = Math::OffsetOrder(ORDER_BOARD, -5); +const float ORDER_MOUSE_TEXT = Math::OffsetOrder(ORDER_BOARD, -6); GameSudo::GameSudo() : _diff{ 0 }, diff --git a/third/asio/include/asio/detail/config.hpp b/third/asio/include/asio/detail/config.hpp index 14cf8cd7..71b47308 100644 --- a/third/asio/include/asio/detail/config.hpp +++ b/third/asio/include/asio/detail/config.hpp @@ -10,7 +10,7 @@ #ifndef ASIO_DETAIL_CONFIG_HPP #define ASIO_DETAIL_CONFIG_HPP - +#define ASIO_HAS_STD_EXCEPTION_PTR 0 // boostify: non-boost code starts here #if !defined(ASIO_STANDALONE) # if !defined(ASIO_ENABLE_BOOST) @@ -173,7 +173,7 @@ # define ASIO_HAS_STD_FUTURE 1 # define ASIO_HAS_STD_TUPLE 1 # define ASIO_HAS_STD_IOSTREAM_MOVE 1 -# define ASIO_HAS_STD_EXCEPTION_PTR 1 +# define ASIO_HAS_STD_EXCEPTION_PTR 0 # define ASIO_HAS_STD_NESTED_EXCEPTION 1 # define ASIO_HAS_STD_HASH 1 #endif // !defined(ASIO_DISABLE_CXX11_MACROS)