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

improve object_array

Browse Source
This commit is contained in:
lixianjing 2021-01-08 17:06:54 +08:00
parent e760b78332
commit 45c51eeb26
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/tkc/object_array.c
View File

@ -163,7 +163,6 @@ static ret_t object_array_remove_prop(object_t* obj, const char* name) {
ret_t object_array_pop(object_t* obj, value_t* v) {
value_t* last = NULL;
ret_t ret = RET_NOT_FOUND;
object_array_t* o = OBJECT_ARRAY(obj);
return_value_if_fail(o != NULL && o->size > 0, RET_BAD_PARAMS);
last = o->props + o->size - 1;
@ -174,13 +173,12 @@ ret_t object_array_pop(object_t* obj, value_t* v) {
return RET_OK;
}
static ret_t object_array_set_prop(object_t* obj, const char* name, const value_t* v) {
ret_t object_array_set(object_t* obj, uint32_t index, const value_t* v) {
ret_t ret = RET_NOT_FOUND;
object_array_t* o = OBJECT_ARRAY(obj);
int32_t index = object_array_parse_index(name);
return_value_if_fail(object_array_extend(obj) == RET_OK, RET_OOM);
if (isdigit(*name) && index >= 0 && index < o->size) {
if (index < o->size) {
value_t* iter = o->props + index;
value_reset(iter);
ret = value_deep_copy(iter, v);
@ -193,6 +191,24 @@ static ret_t object_array_set_prop(object_t* obj, const char* name, const value_
return ret;
}
static ret_t object_array_set_prop(object_t* obj, const char* name, const value_t* v) {
int32_t index = object_array_parse_index(name);
return object_array_set(obj, index, v);
}
ret_t object_array_get(object_t* obj, uint32_t i, value_t* v) {
ret_t ret = RET_OK;
object_array_t* o = OBJECT_ARRAY(obj);
return_value_if_fail(o != NULL, RET_BAD_PARAMS);
if (i < o->size) {
value_t* iter = o->props + i;
ret = value_copy(v, iter);
}
return ret;
}
static ret_t object_array_get_prop(object_t* obj, const char* name, value_t* v) {
ret_t ret = RET_NOT_FOUND;
object_array_t* o = OBJECT_ARRAY(obj);
@ -201,12 +217,12 @@ static ret_t object_array_get_prop(object_t* obj, const char* name, value_t* v)
if (tk_str_eq(name, "length") || tk_str_eq(name, "size") || tk_str_eq(name, "#size")) {
value_set_int(v, o->size);
ret = RET_OK;
} else if (tk_str_eq(name, "capacity")) {
value_set_int(v, o->capacity);
ret = RET_OK;
} else {
int32_t index = object_array_parse_index(name);
if (index >= 0 && index < o->size) {
value_t* iter = o->props + index;
ret = value_copy(v, iter);
}
ret = object_array_get(obj, index, v);
}
return ret;

22
src/tkc/object_array.h
View File

@ -174,6 +174,28 @@ ret_t object_array_remove(object_t* obj, uint32_t index);
*/
ret_t object_array_pop(object_t* obj, value_t* v);
/**
* @method object_array_get
* 获取指定序数的元素。
* @param {object_t*} obj 数组对象。
* @param {uint32_t} i 序数。
* @param {value_t*} v 返回的元素。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t object_array_get(object_t* obj, uint32_t i, value_t* v);
/**
* @method object_array_set
* 设置指定序数的元素。
* @param {object_t*} obj 数组对象。
* @param {uint32_t} i 序数。
* @param {const value_t*} v 元素。
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t object_array_set(object_t* obj, uint32_t i, const value_t* v);
object_array_t* object_array_cast(object_t* obj);
#define OBJECT_ARRAY(obj) object_array_cast(obj)