2 Commits

Author SHA1 Message Date
Adrian Zuercher
274a80d605 fix wrong float and bool conversion 2025-07-15 19:20:11 +02:00
Adrian Zuercher
3b38be8de5 change string to 3 letters STR 2025-07-15 19:19:45 +02:00
2 changed files with 24 additions and 17 deletions

View File

@@ -9,18 +9,18 @@ import (
// all avaiable datatypes of dbm
const (
NONE Type = "NONE"
BIT Type = "BIT" // BOOL
BYU Type = "BYU" // UINT8
BYS Type = "BYS" // INT8
WOS Type = "WOS" // INT16
WOU Type = "WOU" // UINT16
DWS Type = "DWS" // INT32
DWU Type = "DWU" // UINT32
LOS Type = "LOS" // INT64
LOU Type = "LOU" // UINT64
F32 Type = "F32" // FLOAT32
F64 Type = "F64" // FLOAT64
STR Type = "STRING" // STRING
BIT Type = "BIT" // BOOL
BYU Type = "BYU" // UINT8
BYS Type = "BYS" // INT8
WOS Type = "WOS" // INT16
WOU Type = "WOU" // UINT16
DWS Type = "DWS" // INT32
DWU Type = "DWU" // UINT32
LOS Type = "LOS" // INT64
LOU Type = "LOU" // UINT64
F32 Type = "F32" // FLOAT32
F64 Type = "F64" // FLOAT64
STR Type = "STR" // STRING
)
// dbm datatype model

View File

@@ -36,8 +36,8 @@ func Float32From(v any) float32 {
case uint64:
return float32(val)
case string:
if i, err := strconv.Atoi(val); err == nil {
return float32(i)
if f64, err := strconv.ParseFloat(val, 32); err == nil {
return float32(f64)
}
return 0
default:
@@ -76,8 +76,8 @@ func Float64From(v any) float64 {
case uint64:
return float64(val)
case string:
if i, err := strconv.Atoi(val); err == nil {
return float64(i)
if f64, err := strconv.ParseFloat(val, 32); err == nil {
return f64
}
return 0
default:
@@ -433,7 +433,14 @@ func BoolFrom(v any) bool {
case float64:
return val >= 1
case string:
return strings.ToLower(val) == "false" || v == "0"
if strings.ToLower(val) == "true" {
return true
} else if strings.ToLower(val) == "false" {
return false
} else if i, err := strconv.Atoi(val); err == nil {
return i > 0
}
return false
default:
return false
}