Skip to content

Commit

Permalink
add uint support
Browse files Browse the repository at this point in the history 
Signed-off-by: Dmitrii Aleksandrov <[email protected]>
  • Loading branch information
@Insei
Insei committed May 22, 2024
1 parent 5c45ad6 commit 5b246ec
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 1 deletion.
40 changes: 40 additions & 0 deletions field.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ func (f Field) Get(obj interface{}) interface{} {
return getPtrValue[*int32](ptrToField)
case reflect.Int64:
return getPtrValue[*int64](ptrToField)
case reflect.Uint:
return getPtrValue[*uint](ptrToField)
case reflect.Uint8:
return getPtrValue[*uint8](ptrToField)
case reflect.Uint16:
return getPtrValue[*uint16](ptrToField)
case reflect.Uint32:
return getPtrValue[*uint32](ptrToField)
case reflect.Uint64:
return getPtrValue[*uint64](ptrToField)
case reflect.Float32:
return getPtrValue[*float32](ptrToField)
case reflect.Float64:
Expand Down Expand Up @@ -65,6 +75,16 @@ func (f Field) Get(obj interface{}) interface{} {
return getPtrValue[int32](ptrToField)
case reflect.Int64:
return getPtrValue[int64](ptrToField)
case reflect.Uint:
return getPtrValue[uint](ptrToField)
case reflect.Uint8:
return getPtrValue[uint8](ptrToField)
case reflect.Uint16:
return getPtrValue[uint16](ptrToField)
case reflect.Uint32:
return getPtrValue[uint32](ptrToField)
case reflect.Uint64:
return getPtrValue[uint64](ptrToField)
case reflect.Float32:
return getPtrValue[float32](ptrToField)
case reflect.Float64:
Expand Down Expand Up @@ -132,6 +152,16 @@ func (f Field) Set(obj interface{}, val interface{}) {
setPtrValue[*int32](ptrToField, val)
case reflect.Int64:
setPtrValue[*int64](ptrToField, val)
case reflect.Uint:
setPtrValue[*uint](ptrToField, val)
case reflect.Uint8:
setPtrValue[*uint8](ptrToField, val)
case reflect.Uint16:
setPtrValue[*uint16](ptrToField, val)
case reflect.Uint32:
setPtrValue[*uint32](ptrToField, val)
case reflect.Uint64:
setPtrValue[*uint64](ptrToField, val)
case reflect.Float32:
setPtrValue[*float32](ptrToField, val)
case reflect.Float64:
Expand All @@ -158,6 +188,16 @@ func (f Field) Set(obj interface{}, val interface{}) {
setPtrValue[int32](ptrToField, val)
case reflect.Int64:
setPtrValue[int64](ptrToField, val)
case reflect.Uint:
setPtrValue[uint](ptrToField, val)
case reflect.Uint8:
setPtrValue[uint8](ptrToField, val)
case reflect.Uint16:
setPtrValue[uint16](ptrToField, val)
case reflect.Uint32:
setPtrValue[uint32](ptrToField, val)
case reflect.Uint64:
setPtrValue[uint64](ptrToField, val)
case reflect.Float32:
setPtrValue[float32](ptrToField, val)
case reflect.Float64:
Expand Down
70 changes: 70 additions & 0 deletions fields_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ type TestStruct struct {
Int16 int16
Int32 int32
Int64 int64
Uint uint
Uint8 uint8
Uint16 uint16
Uint32 uint32
Uint64 uint64
Float32 float32
Float64 float64
Bool bool
Expand All @@ -31,6 +36,11 @@ type TestStruct struct {
PtrInt16 *int16
PtrInt32 *int32
PtrInt64 *int64
PtrUint *uint
PtrUint8 *uint8
PtrUint16 *uint16
PtrUint32 *uint32
PtrUint64 *uint64
PtrFloat32 *float32
PtrFloat64 *float64
PtrBool *bool
Expand All @@ -47,6 +57,11 @@ func TestGetFrom(t *testing.T) {
assert.Contains(t, fieldMap, "Int16")
assert.Contains(t, fieldMap, "Int32")
assert.Contains(t, fieldMap, "Int64")
assert.Contains(t, fieldMap, "Uint")
assert.Contains(t, fieldMap, "Uint8")
assert.Contains(t, fieldMap, "Uint16")
assert.Contains(t, fieldMap, "Uint32")
assert.Contains(t, fieldMap, "Uint64")
assert.Contains(t, fieldMap, "Float32")
assert.Contains(t, fieldMap, "Float64")
assert.Contains(t, fieldMap, "Bool")
Expand All @@ -56,6 +71,11 @@ func TestGetFrom(t *testing.T) {
assert.Contains(t, fieldMap, "PtrInt16")
assert.Contains(t, fieldMap, "PtrInt32")
assert.Contains(t, fieldMap, "PtrInt64")
assert.Contains(t, fieldMap, "PtrUint")
assert.Contains(t, fieldMap, "PtrUint8")
assert.Contains(t, fieldMap, "PtrUint16")
assert.Contains(t, fieldMap, "PtrUint32")
assert.Contains(t, fieldMap, "PtrUint64")
assert.Contains(t, fieldMap, "PtrFloat32")
assert.Contains(t, fieldMap, "PtrFloat64")
assert.Contains(t, fieldMap, "PtrBool")
Expand All @@ -77,6 +97,11 @@ func TestGet(t *testing.T) {
int16Val := int16(3)
int32Val := int32(4)
int64Val := int64(5)
uintVal := uint(6)
uint8Val := uint8(7)
uint16Val := uint16(8)
uint32Val := uint32(9)
uint64Val := uint64(10)
f32Val := float32(6.6)
f64Val := float64(7.7)
boolVal := true
Expand All @@ -89,6 +114,11 @@ func TestGet(t *testing.T) {
Int16: int16Val,
Int32: int32Val,
Int64: int64Val,
Uint: uintVal,
Uint8: uint8Val,
Uint16: uint16Val,
Uint32: uint32Val,
Uint64: uint64Val,
Float32: f32Val,
Float64: f64Val,
Bool: boolVal,
Expand All @@ -100,6 +130,11 @@ func TestGet(t *testing.T) {
PtrInt16: &int16Val,
PtrInt32: &int32Val,
PtrInt64: &int64Val,
PtrUint: &uintVal,
PtrUint8: &uint8Val,
PtrUint16: &uint16Val,
PtrUint32: &uint32Val,
PtrUint64: &uint64Val,
PtrFloat32: &f32Val,
PtrFloat64: &f64Val,
PtrBool: &boolVal,
Expand All @@ -117,6 +152,11 @@ func TestGet(t *testing.T) {
assert.Equal(t, source.Int16, fieldsMap["Int16"].Get(source))
assert.Equal(t, source.Int32, fieldsMap["Int32"].Get(source))
assert.Equal(t, source.Int64, fieldsMap["Int64"].Get(source))
assert.Equal(t, source.Uint, fieldsMap["Uint"].Get(source))
assert.Equal(t, source.Uint8, fieldsMap["Uint8"].Get(source))
assert.Equal(t, source.Uint16, fieldsMap["Uint16"].Get(source))
assert.Equal(t, source.Uint32, fieldsMap["Uint32"].Get(source))
assert.Equal(t, source.Uint64, fieldsMap["Uint64"].Get(source))
assert.Equal(t, source.Float32, fieldsMap["Float32"].Get(source))
assert.Equal(t, source.Float64, fieldsMap["Float64"].Get(source))
assert.Equal(t, source.Bool, fieldsMap["Bool"].Get(source))
Expand All @@ -127,6 +167,11 @@ func TestGet(t *testing.T) {
assert.Equal(t, source.PtrInt16, fieldsMap["PtrInt16"].Get(source))
assert.Equal(t, source.PtrInt32, fieldsMap["PtrInt32"].Get(source))
assert.Equal(t, source.PtrInt64, fieldsMap["PtrInt64"].Get(source))
assert.Equal(t, source.PtrUint, fieldsMap["PtrUint"].Get(source))
assert.Equal(t, source.PtrUint8, fieldsMap["PtrUint8"].Get(source))
assert.Equal(t, source.PtrUint16, fieldsMap["PtrUint16"].Get(source))
assert.Equal(t, source.PtrUint32, fieldsMap["PtrUint32"].Get(source))
assert.Equal(t, source.PtrUint64, fieldsMap["PtrUint64"].Get(source))
assert.Equal(t, source.PtrFloat32, fieldsMap["PtrFloat32"].Get(source))
assert.Equal(t, source.PtrFloat64, fieldsMap["PtrFloat64"].Get(source))
assert.Equal(t, source.PtrBool, fieldsMap["PtrBool"].Get(source))
Expand All @@ -147,6 +192,11 @@ func TestSet(t *testing.T) {
int16Val := int16(8)
int32Val := int32(9)
int64Val := int64(10)
uintVal := uint(6)
uint8Val := uint8(7)
uint16Val := uint16(8)
uint32Val := uint32(9)
uint64Val := uint64(10)
f32Val := float32(11.11)
f64Val := 12.12
boolVal := true
Expand All @@ -161,6 +211,11 @@ func TestSet(t *testing.T) {
fieldMap["Int16"].Set(dest, int16Val)
fieldMap["Int32"].Set(dest, int32Val)
fieldMap["Int64"].Set(dest, int64Val)
fieldMap["Uint"].Set(dest, uintVal)
fieldMap["Uint8"].Set(dest, uint8Val)
fieldMap["Uint16"].Set(dest, uint16Val)
fieldMap["Uint32"].Set(dest, uint32Val)
fieldMap["Uint64"].Set(dest, uint64Val)
fieldMap["Float32"].Set(dest, f32Val)
fieldMap["Float64"].Set(dest, f64Val)
fieldMap["Bool"].Set(dest, boolVal)
Expand All @@ -172,6 +227,11 @@ func TestSet(t *testing.T) {
fieldMap["PtrInt16"].Set(dest, &int16Val)
fieldMap["PtrInt32"].Set(dest, &int32Val)
fieldMap["PtrInt64"].Set(dest, &int64Val)
fieldMap["PtrUint"].Set(dest, &uintVal)
fieldMap["PtrUint8"].Set(dest, &uint8Val)
fieldMap["PtrUint16"].Set(dest, &uint16Val)
fieldMap["PtrUint32"].Set(dest, &uint32Val)
fieldMap["PtrUint64"].Set(dest, &uint64Val)
fieldMap["PtrFloat32"].Set(dest, &f32Val)
fieldMap["PtrFloat64"].Set(dest, &f64Val)
fieldMap["PtrBool"].Set(dest, &boolVal)
Expand All @@ -186,6 +246,11 @@ func TestSet(t *testing.T) {
assert.Equal(t, int16Val, dest.Int16)
assert.Equal(t, int32Val, dest.Int32)
assert.Equal(t, int64Val, dest.Int64)
assert.Equal(t, uintVal, dest.Uint)
assert.Equal(t, uint8Val, dest.Uint8)
assert.Equal(t, uint16Val, dest.Uint16)
assert.Equal(t, uint32Val, dest.Uint32)
assert.Equal(t, uint64Val, dest.Uint64)
assert.Equal(t, f32Val, dest.Float32)
assert.Equal(t, f64Val, dest.Float64)
assert.Equal(t, boolVal, dest.Bool)
Expand All @@ -197,6 +262,11 @@ func TestSet(t *testing.T) {
assert.Equal(t, &int16Val, dest.PtrInt16)
assert.Equal(t, &int32Val, dest.PtrInt32)
assert.Equal(t, &int64Val, dest.PtrInt64)
assert.Equal(t, &uintVal, dest.PtrUint)
assert.Equal(t, &uint8Val, dest.PtrUint8)
assert.Equal(t, &uint16Val, dest.PtrUint16)
assert.Equal(t, &uint32Val, dest.PtrUint32)
assert.Equal(t, &uint64Val, dest.PtrUint64)
assert.Equal(t, &f32Val, dest.PtrFloat32)
assert.Equal(t, &f64Val, dest.PtrFloat64)
assert.Equal(t, &boolVal, dest.PtrBool)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
)
5 changes: 5 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 comments on commit 5b246ec

Please sign in to comment.