mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
148 lines
4.0 KiB
Go
148 lines
4.0 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package converter
|
|
|
|
import (
|
|
"reflect"
|
|
"strconv"
|
|
|
|
"github.com/gogf/gf/v2/encoding/gbinary"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/empty"
|
|
"github.com/gogf/gf/v2/util/gconv/internal/localinterface"
|
|
)
|
|
|
|
// Float32 converts `any` to float32.
|
|
func (c *Converter) Float32(anyInput any) (float32, error) {
|
|
if empty.IsNil(anyInput) {
|
|
return 0, nil
|
|
}
|
|
switch value := anyInput.(type) {
|
|
case float32:
|
|
return value, nil
|
|
case float64:
|
|
return float32(value), nil
|
|
case []byte:
|
|
// TODO: It might panic here for these types.
|
|
return gbinary.DecodeToFloat32(value), nil
|
|
default:
|
|
rv := reflect.ValueOf(anyInput)
|
|
switch rv.Kind() {
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
return float32(rv.Int()), nil
|
|
case reflect.Uintptr, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
return float32(rv.Uint()), nil
|
|
case reflect.Float32, reflect.Float64:
|
|
return float32(rv.Float()), nil
|
|
case reflect.Bool:
|
|
if rv.Bool() {
|
|
return 1, nil
|
|
}
|
|
return 0, nil
|
|
case reflect.String:
|
|
f, err := strconv.ParseFloat(rv.String(), 32)
|
|
if err != nil {
|
|
return 0, gerror.WrapCodef(
|
|
gcode.CodeInvalidParameter, err, "converting string to float32 failed for: %v", anyInput,
|
|
)
|
|
}
|
|
return float32(f), nil
|
|
case reflect.Pointer:
|
|
if rv.IsNil() {
|
|
return 0, nil
|
|
}
|
|
if f, ok := value.(localinterface.IFloat32); ok {
|
|
return f.Float32(), nil
|
|
}
|
|
return c.Float32(rv.Elem().Interface())
|
|
default:
|
|
if f, ok := value.(localinterface.IFloat32); ok {
|
|
return f.Float32(), nil
|
|
}
|
|
s, err := c.String(anyInput)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
v, err := strconv.ParseFloat(s, 32)
|
|
if err != nil {
|
|
return 0, gerror.WrapCodef(
|
|
gcode.CodeInvalidParameter, err, "converting string to float32 failed for: %v", anyInput,
|
|
)
|
|
}
|
|
return float32(v), nil
|
|
}
|
|
}
|
|
}
|
|
|
|
// Float64 converts `any` to float64.
|
|
func (c *Converter) Float64(anyInput any) (float64, error) {
|
|
if empty.IsNil(anyInput) {
|
|
return 0, nil
|
|
}
|
|
switch value := anyInput.(type) {
|
|
case float32:
|
|
return float64(value), nil
|
|
case float64:
|
|
return value, nil
|
|
case []byte:
|
|
// TODO: It might panic here for these types.
|
|
return gbinary.DecodeToFloat64(value), nil
|
|
default:
|
|
rv := reflect.ValueOf(anyInput)
|
|
switch rv.Kind() {
|
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
|
|
return float64(rv.Int()), nil
|
|
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
|
|
return float64(rv.Uint()), nil
|
|
case reflect.Uintptr:
|
|
return float64(rv.Uint()), nil
|
|
case reflect.Float32, reflect.Float64:
|
|
// Please Note:
|
|
// When the type is float32 or a custom type defined based on float32,
|
|
// switching to float64 may result in a few extra decimal places.
|
|
return rv.Float(), nil
|
|
case reflect.Bool:
|
|
if rv.Bool() {
|
|
return 1, nil
|
|
}
|
|
return 0, nil
|
|
case reflect.String:
|
|
f, err := strconv.ParseFloat(rv.String(), 64)
|
|
if err != nil {
|
|
return 0, gerror.WrapCodef(
|
|
gcode.CodeInvalidParameter, err, "converting string to float64 failed for: %v", anyInput,
|
|
)
|
|
}
|
|
return f, nil
|
|
case reflect.Pointer:
|
|
if rv.IsNil() {
|
|
return 0, nil
|
|
}
|
|
if f, ok := value.(localinterface.IFloat64); ok {
|
|
return f.Float64(), nil
|
|
}
|
|
return c.Float64(rv.Elem().Interface())
|
|
default:
|
|
if f, ok := value.(localinterface.IFloat64); ok {
|
|
return f.Float64(), nil
|
|
}
|
|
s, err := c.String(anyInput)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
v, err := strconv.ParseFloat(s, 64)
|
|
if err != nil {
|
|
return 0, gerror.WrapCodef(
|
|
gcode.CodeInvalidParameter, err, "converting string to float64 failed for: %v", anyInput,
|
|
)
|
|
}
|
|
return v, nil
|
|
}
|
|
}
|
|
}
|