test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve object clone

Browse Source
This commit is contained in:
lixianjing 2024-08-22 17:37:43 +08:00
parent bd9a8e6048
commit 239704c38c
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -3,6 +3,7 @@
2024/08/22
* 解决 object_hash 冲突问题(感谢兆坤提供补丁)
* 完善 object_hash 测试 (感谢兆坤提供补丁)
* 修复 object_clone (感谢兆坤提供补丁)
2024/08/21
* release 1.8

5
src/tkc/object_default.c
View File

@ -339,6 +339,11 @@ tk_object_t* object_default_clone(object_default_t* o) {
return_value_if_fail(dup != NULL, NULL);
dupo = OBJECT_DEFAULT(dup);
dupo->enable_path = o->enable_path;
dupo->keep_prop_type = o->keep_prop_type;
dupo->name_case_insensitive = o->name_case_insensitive;
for (i = 0; i < o->props.size; i++) {
named_value_t* iter = (named_value_t*)(o->props.elms[i]);
named_value_t* nv = named_value_create_ex(iter->name, &(iter->value));

9
src/tkc/object_hash.c
View File

@ -54,8 +54,8 @@ static int32_t object_hash_find_prop_index_by_name(tk_object_t* obj, const char*
(void*)hash, &bucket)) {
named_value_hash_t* right_nvh = NULL;
darray_sort(&bucket, (tk_compare_t)named_value_compare);
right_nvh =
darray_bsearch(&bucket, (tk_compare_t)named_value_compare_by_name, (void*)name);
right_nvh = (named_value_hash_t*)darray_bsearch(
&bucket, (tk_compare_t)named_value_compare_by_name, (void*)name);
if (right_nvh != NULL) {
ret = darray_find_index_ex(&o->props, pointer_compare, (void*)right_nvh);
}
@ -355,6 +355,11 @@ tk_object_t* object_hash_clone(object_hash_t* o) {
return_value_if_fail(dup != NULL, NULL);
dupo = OBJECT_HASH(dup);
dupo->hash_base = o->hash_base;
dupo->enable_path = o->enable_path;
dupo->keep_prop_type = o->keep_prop_type;
for (i = 0; i < o->props.size; i++) {
named_value_hash_t* iter = (named_value_hash_t*)(o->props.elms[i]);
named_value_hash_t* nvh = named_value_hash_clone(iter);