zlgopen/awtk
1
0
Fork 0
mirror of https://github.com/zlgopen/awtk.git synced 2025-05-08 11:33:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve tk_watob

Browse Source
This commit is contained in:
lixianjing 2025-05-06 17:39:01 +08:00
parent d22181dcc8
commit 4e8978d71d
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -2,6 +2,7 @@
2025/05/06
* object hash 兼容32位系统(感谢兆坤提供补丁)。
* 完善tk_watob，与tk_atob逻辑相同(感谢兆坤提供补丁)。
2025/04/30
* 完善 mem_allocator_fixed_block(感谢兆坤提供补丁)。

2
src/tkc/utils.c
View File

@ -743,7 +743,7 @@ int tk_watoi(const wchar_t* str) {
}
bool_t tk_watob(const wchar_t* str) {
if (str == NULL || *str == 'f' || *str == 'F') {
if (TK_STR_IS_EMPTY(str) || *str == 'f' || *str == 'F' || tk_wstr_eq(str, L"0")) {
return FALSE;
}

43
tests/utils_test.cc
View File

@ -1974,6 +1974,39 @@ TEST(Utils, atob) {
ASSERT_EQ(tk_atob("abcd"), TRUE);
}
TEST(Utils, watob) {
ASSERT_EQ(tk_watob(L"FALSE"), FALSE);
ASSERT_EQ(tk_watob(L"False"), FALSE);
ASSERT_EQ(tk_watob(L"F"), FALSE);
ASSERT_EQ(tk_watob(L"f"), FALSE);
ASSERT_EQ(tk_watob(L"\"FALSE\""), TRUE);
ASSERT_EQ(tk_watob(L"'FALSE'"), TRUE);
ASSERT_EQ(tk_watob(L" FALSE "), TRUE);
ASSERT_EQ(tk_watob(L"TRUE"), TRUE);
ASSERT_EQ(tk_watob(L"True"), TRUE);
ASSERT_EQ(tk_watob(L"T"), TRUE);
ASSERT_EQ(tk_watob(L"t"), TRUE);
ASSERT_EQ(tk_watob(L"\"TRUE\""), TRUE);
ASSERT_EQ(tk_watob(L"'TRUE'"), TRUE);
ASSERT_EQ(tk_watob(L" TRUE "), TRUE);
ASSERT_EQ(tk_watob(NULL), FALSE);
ASSERT_EQ(tk_watob(L""), FALSE);
ASSERT_EQ(tk_watob(L" "), TRUE);
ASSERT_EQ(tk_watob(L"0"), FALSE);
ASSERT_EQ(tk_watob(L"00"), TRUE);
ASSERT_EQ(tk_watob(L"0AWTK"), TRUE);
ASSERT_EQ(tk_watob(L"1"), TRUE);
ASSERT_EQ(tk_watob(L"-1"), TRUE);
ASSERT_EQ(tk_watob(L"2"), TRUE);
ASSERT_EQ(tk_watob(L"abcd"), TRUE);
}
TEST(Utils, tk_strs_bsearch) {
const char* strs[] = {"abc1", "abc2", "abc3", "abc4", "abc5", "b", "c", "d"};
ASSERT_EQ(tk_strs_bsearch(strs, 0, "Abc1", TRUE), (char*)NULL);
@ -2026,7 +2059,7 @@ TEST(Utils, tk_normalize_rad) {
ASSERT_DOUBLE_EQ(tk_normalize_rad(3 - twopi), 3);
ASSERT_DOUBLE_EQ(tk_normalize_rad(4 - twopi), 4);
ASSERT_DOUBLE_EQ(tk_normalize_rad(5 - twopi), 5);
ASSERT_DOUBLE_EQ(tk_normalize_rad(6 - twopi), 6);
ASSERT_DOUBLE_EQ(tk_normalize_rad(6 - twopi), 6);
}
TEST(Utils, tk_compare_rad) {
@ -2045,7 +2078,7 @@ TEST(Utils, tk_compare_rad) {
ASSERT_EQ(tk_rad_equal(3, 3 + twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(4, 4 + twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(5, 5 + twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(6, 6 + twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(6, 6 + twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(0, 0 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(1, 1 - twopi, 0.0001), TRUE);
@ -2053,7 +2086,7 @@ TEST(Utils, tk_compare_rad) {
ASSERT_EQ(tk_rad_equal(3, 3 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(4, 4 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(5, 5 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(6, 6 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(6, 6 - twopi, 0.0001), TRUE);
ASSERT_EQ(tk_rad_equal(0, 0 - twopi + 1, 0.0001), FALSE);
ASSERT_EQ(tk_rad_equal(1, 1 - twopi + 1, 0.0001), FALSE);
@ -2061,7 +2094,7 @@ TEST(Utils, tk_compare_rad) {
ASSERT_EQ(tk_rad_equal(3, 3 - twopi + 1, 0.0001), FALSE);
ASSERT_EQ(tk_rad_equal(4, 4 - twopi + 1, 0.0001), FALSE);
ASSERT_EQ(tk_rad_equal(5, 5 - twopi + 1, 0.0001), FALSE);
ASSERT_EQ(tk_rad_equal(6, 6 - twopi + 1, 0.0001), FALSE);
ASSERT_EQ(tk_rad_equal(6, 6 - twopi + 1, 0.0001), FALSE);
}
TEST(Utils, tk_swap) {
@ -2070,7 +2103,7 @@ TEST(Utils, tk_swap) {
tk_swap(a, b, int);
ASSERT_EQ(a, 2);
ASSERT_EQ(b, 1);
tk_swap(a, b, int);
ASSERT_EQ(a, 1);
ASSERT_EQ(b, 2);