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

improve value

Browse Source
This commit is contained in:
xianjimli 2018-11-13 11:31:58 +08:00
parent c218874663
commit 19d3b7d05b
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/base/value.c
View File

@ -55,6 +55,9 @@ bool_t value_bool(const value_t* v) {
return v->value.u64 ? TRUE : FALSE;
}
case VALUE_TYPE_FLOAT: {
return v->value.f ? TRUE : FALSE;
}
case VALUE_TYPE_FLOAT32: {
return v->value.f32 ? TRUE : FALSE;
}
case VALUE_TYPE_DOUBLE: {
@ -217,47 +220,50 @@ value_t* value_set_float(value_t* v, float value) {
return_value_if_fail(v != NULL, NULL);
v->type = VALUE_TYPE_FLOAT;
v->value.f32 = value;
v->value.f = value;
return v;
}
float value_float(const value_t* v) {
float_t value_float(const value_t* v) {
return_value_if_fail(v->type != VALUE_TYPE_INVALID, 0);
switch (v->type) {
case VALUE_TYPE_INT8: {
return (float)v->value.i8;
return (float_t)v->value.i8;
}
case VALUE_TYPE_UINT8: {
return (float)v->value.u8;
return (float_t)v->value.u8;
}
case VALUE_TYPE_INT16: {
return (float)v->value.i16;
return (float_t)v->value.i16;
}
case VALUE_TYPE_UINT16: {
return (float)v->value.u16;
return (float_t)v->value.u16;
}
case VALUE_TYPE_INT32: {
return (float)v->value.i32;
return (float_t)v->value.i32;
}
case VALUE_TYPE_UINT32: {
return (float)v->value.u32;
return (float_t)v->value.u32;
}
case VALUE_TYPE_INT64: {
return (float)v->value.i64;
return (float_t)v->value.i64;
}
case VALUE_TYPE_UINT64: {
return (float)v->value.u64;
return (float_t)v->value.u64;
}
case VALUE_TYPE_FLOAT: {
return (float)v->value.f32;
return (float_t)v->value.f;
}
case VALUE_TYPE_FLOAT32: {
return (float_t)v->value.f32;
}
case VALUE_TYPE_DOUBLE: {
return (float)v->value.f64;
return (float_t)v->value.f64;
}
case VALUE_TYPE_STRING: {
return tk_atof(v->value.str);
return (float_t)tk_atof(v->value.str);
}
default:
break;
@ -266,6 +272,21 @@ float value_float(const value_t* v) {
return 0;
}
value_t* value_set_float32(value_t* v, float value) {
return_value_if_fail(v != NULL, NULL);
v->type = VALUE_TYPE_FLOAT;
v->value.f32 = value;
return v;
}
float value_float32(const value_t* v) {
return_value_if_fail(v->type != VALUE_TYPE_INVALID, 0);
return v->value.f32;
}
value_t* value_set_double(value_t* v, double value) {
return_value_if_fail(v != NULL, NULL);
@ -352,6 +373,9 @@ int value_int(const value_t* v) {
return (int)v->value.u64;
}
case VALUE_TYPE_FLOAT: {
return (int)v->value.f;
}
case VALUE_TYPE_FLOAT32: {
return (int)v->value.f32;
}
case VALUE_TYPE_DOUBLE: {
@ -408,6 +432,9 @@ bool_t value_equal(const value_t* v, const value_t* other) {
return v->value.u64 == other->value.u64;
}
case VALUE_TYPE_FLOAT: {
return tk_fequal(v->value.f, other->value.f32);
}
case VALUE_TYPE_FLOAT32: {
return tk_fequal(v->value.f32, other->value.f32);
}
case VALUE_TYPE_DOUBLE: {