test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fscript support + for binary data

Browse Source
This commit is contained in:
lixianjing 2024-03-21 17:35:20 +08:00
parent ee4be2f425
commit 0901acfca4
3 changed files with 62 additions and 3 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 @@
2024/03/21
* 完善tk\_buffer\_set\_value/tk\_buffer\_get\_value
* fscript 支持用+拼接binary\_data
2024/03/20
* 增加函数tk\_object\_set\_prop\_str\_with\_format

24
src/tkc/fscript.c
View File

@ -20,6 +20,7 @@
#include "tkc/darray.h"
#include "tkc/fscript.h"
#include "tkc/int_str.h"
#include "tkc/buffer.h"
#include "tkc/object_default.h"
#include "tkc/general_factory.h"
#include "tkc/object_locker.h"
@ -2188,6 +2189,7 @@ static ret_t func_sum(fscript_t* fscript, fscript_args_t* args, value_t* result)
double v = 0;
uint32_t i = 0;
bool_t has_str = FALSE;
bool_t has_bin = FALSE;
bool_t has_float = FALSE;
FSCRIPT_FUNC_CHECK(args->size > 0, RET_BAD_PARAMS);
@ -2195,8 +2197,10 @@ static ret_t func_sum(fscript_t* fscript, fscript_args_t* args, value_t* result)
int type = args->args[i].type;
if (type == VALUE_TYPE_STRING) {
has_str = TRUE;
}
if (type == VALUE_TYPE_FLOAT || type == VALUE_TYPE_DOUBLE || type == VALUE_TYPE_FLOAT32) {
} else if (type == VALUE_TYPE_BINARY) {
has_bin = TRUE;
} else if (type == VALUE_TYPE_FLOAT || type == VALUE_TYPE_DOUBLE ||
type == VALUE_TYPE_FLOAT32) {
has_float = TRUE;
}
}
@ -2210,6 +2214,22 @@ static ret_t func_sum(fscript_t* fscript, fscript_args_t* args, value_t* result)
}
value_dup_str(result, str.str);
str_reset(&str);
} else if (has_bin) {
wbuffer_t wb;
char buff[64];
wbuffer_init_extendable(&wb);
for (i = 0; i < args->size; i++) {
value_t* iter = args->args + i;
if (iter->type == VALUE_TYPE_BINARY) {
binary_data_t* b = value_binary_data(iter);
wbuffer_write_binary(&wb, b->data, b->size);
} else {
wbuffer_write_string(&wb, value_str_ex(iter, buff, sizeof(buff) - 1));
}
}
value_set_binary_data(result, wb.data, wb.cursor);
result->free_handle = TRUE;
} else {
for (i = 0; i < args->size; i++) {
v += value_double(args->args + i);

40
tests/fscript_test.cc
View File

@ -3459,4 +3459,42 @@ TEST(FExr, sha256) {
value_reset(&v);
TK_OBJECT_UNREF(obj);
}
}
TEST(FExr, sum_bin1) {
value_t v;
tk_object_t* obj = object_default_create();
value_set_binary_data(&v, (void*)"abc", 3);
tk_object_set_prop(obj, "v1", &v);
value_set_binary_data(&v, (void*)"123", 3);
tk_object_set_prop(obj, "v2", &v);
fscript_eval(obj, "v1+v2", &v);
binary_data_t* b = value_binary_data(&v);
ASSERT_STREQ((char*)(b->data), "abc123");
ASSERT_EQ(b->size, 6);
value_reset(&v);
TK_OBJECT_UNREF(obj);
}
TEST(FExr, sum_bin2) {
value_t v;
tk_object_t* obj = object_default_create();
value_set_binary_data(&v, (void*)"abc", 3);
tk_object_set_prop(obj, "v1", &v);
value_set_int(&v, 123);
tk_object_set_prop(obj, "v2", &v);
fscript_eval(obj, "v1+v2", &v);
binary_data_t* b = value_binary_data(&v);
ASSERT_STREQ((char*)(b->data), "abc123");
ASSERT_EQ(b->size, 7);
value_reset(&v);
TK_OBJECT_UNREF(obj);
}