go-pkg/expr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utils.go: toInt() -> ToInt(); toBool() -> ToBool()

Browse Source
This commit is contained in:
Celestino Amoroso 2024-06-10 19:03:39 +02:00
parent 0bb4c96481
commit 9745a5d909
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-string.go
View File

@ -66,11 +66,11 @@ func subStrFunc(ctx ExprContext, name string, args []any) (result any, err error
return nil, errWrongParamType(name, ParamSource, TypeString, args[0]) return nil, errWrongParamType(name, ParamSource, TypeString, args[0])
} }
if start, err = toInt(args[1], name+"()"); err != nil { if start, err = ToInt(args[1], name+"()"); err != nil {
return return
} }
if count, err = toInt(args[2], name+"()"); err != nil { if count, err = ToInt(args[2], name+"()"); err != nil {
return return
} }

6
iter-list.go
View File

@ -26,21 +26,21 @@ func NewListIterator(list *ListType, args []any) (it *ListIterator) {
} }
it = &ListIterator{a: list, count: 0, index: -1, start: 0, stop: listLen - 1, step: 1} it = &ListIterator{a: list, count: 0, index: -1, start: 0, stop: listLen - 1, step: 1}
if argc >= 1 { if argc >= 1 {
if i, err := toInt(args[0], "start index"); err == nil { if i, err := ToInt(args[0], "start index"); err == nil {
if i < 0 { if i < 0 {
i = listLen + i i = listLen + i
} }
it.start = i it.start = i
} }
if argc >= 2 { if argc >= 2 {
if i, err := toInt(args[1], "stop index"); err == nil { if i, err := ToInt(args[1], "stop index"); err == nil {
if i < 0 { if i < 0 {
i = listLen + i i = listLen + i
} }
it.stop = i it.stop = i
} }
if argc >= 3 { if argc >= 3 {
if i, err := toInt(args[2], "step"); err == nil { if i, err := ToInt(args[2], "step"); err == nil {
if i < 0 { if i < 0 {
i = -i i = -i
} }

18
operator-bool.go
View File

@ -25,7 +25,7 @@ func evalNot(ctx ExprContext, self *term) (v any, err error) {
return return
} }
if b, ok := toBool(rightValue); ok { if b, ok := ToBool(rightValue); ok {
v = !b v = !b
} else { } else {
err = self.errIncompatibleType(rightValue) err = self.errIncompatibleType(rightValue)
@ -65,8 +65,8 @@ func evalAndWithoutShortcut(ctx ExprContext, self *term) (v any, err error) {
return return
} }
leftBool, lok = toBool(leftValue) leftBool, lok = ToBool(leftValue)
rightBool, rok = toBool(rightValue) rightBool, rok = ToBool(rightValue)
if lok && rok { if lok && rok {
v = leftBool && rightBool v = leftBool && rightBool
@ -87,13 +87,13 @@ func evalAndWithShortcut(ctx ExprContext, self *term) (v any, err error) {
return return
} }
if leftBool, lok := toBool(leftValue); !lok { if leftBool, lok := ToBool(leftValue); !lok {
err = fmt.Errorf("got %T as left operand type of 'and' operator, it must be bool", leftBool) err = fmt.Errorf("got %T as left operand type of 'and' operator, it must be bool", leftBool)
return return
} else if !leftBool { } else if !leftBool {
v = false v = false
} else if rightValue, err = self.children[1].compute(ctx); err == nil { } else if rightValue, err = self.children[1].compute(ctx); err == nil {
if rightBool, rok := toBool(rightValue); rok { if rightBool, rok := ToBool(rightValue); rok {
v = rightBool v = rightBool
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)
@ -134,8 +134,8 @@ func evalOrWithoutShortcut(ctx ExprContext, self *term) (v any, err error) {
return return
} }
leftBool, lok = toBool(leftValue) leftBool, lok = ToBool(leftValue)
rightBool, rok = toBool(rightValue) rightBool, rok = ToBool(rightValue)
if lok && rok { if lok && rok {
v = leftBool || rightBool v = leftBool || rightBool
@ -156,13 +156,13 @@ func evalOrWithShortcut(ctx ExprContext, self *term) (v any, err error) {
return return
} }
if leftBool, lok := toBool(leftValue); !lok { if leftBool, lok := ToBool(leftValue); !lok {
err = fmt.Errorf("got %T as left operand type of 'or' operator, it must be bool", leftBool) err = fmt.Errorf("got %T as left operand type of 'or' operator, it must be bool", leftBool)
return return
} else if leftBool { } else if leftBool {
v = true v = true
} else if rightValue, err = self.children[1].compute(ctx); err == nil { } else if rightValue, err = self.children[1].compute(ctx); err == nil {
if rightBool, rok := toBool(rightValue); rok { if rightBool, rok := ToBool(rightValue); rok {
v = rightBool v = rightBool
} else { } else {
err = self.errIncompatibleTypes(leftValue, rightValue) err = self.errIncompatibleTypes(leftValue, rightValue)

2
operator-index.go
View File

@ -23,7 +23,7 @@ func verifyKey(indexTerm *term, indexList *ListType) (index any, err error) {
func verifyIndex(indexTerm *term, indexList *ListType, maxValue int) (index int, err error) { func verifyIndex(indexTerm *term, indexList *ListType, maxValue int) (index int, err error) {
var v int var v int
if v, err = toInt((*indexList)[0], "index expression"); err == nil { if v, err = ToInt((*indexList)[0], "index expression"); err == nil {
if v < 0 && v >= -maxValue { if v < 0 && v >= -maxValue {
v = maxValue + v v = maxValue + v
} }

2
operator-length.go
View File

@ -36,7 +36,7 @@ func evalLength(ctx ExprContext, self *term) (v any, err error) {
} else if it, ok := childValue.(Iterator); ok { } else if it, ok := childValue.(Iterator); ok {
if extIt, ok := childValue.(ExtIterator); ok && extIt.HasOperation(countName) { if extIt, ok := childValue.(ExtIterator); ok && extIt.HasOperation(countName) {
count, _ := extIt.CallOperation(countName, nil) count, _ := extIt.CallOperation(countName, nil)
v, _ = toInt(count, "") v, _ = ToInt(count, "")
} else { } else {
v = int64(it.Index() + 1) v = int64(it.Index() + 1)
} }

2
operator-rel.go
View File

@ -70,7 +70,7 @@ func newNotEqualTerm(tk *Token) (inst *term) {
func evalNotEqual(ctx ExprContext, self *term) (v any, err error) { func evalNotEqual(ctx ExprContext, self *term) (v any, err error) {
if v, err = evalEqual(ctx, self); err == nil { if v, err = evalEqual(ctx, self); err == nil {
b, _ := toBool(v) b, _ := ToBool(v)
v = !b v = !b
} }
return return

10
t_utils_test.go
View File

@ -63,7 +63,7 @@ func TestIsString(t *testing.T) {
} }
count++ count++
b, ok := toBool(true) b, ok := ToBool(true)
if !(ok && b) { if !(ok && b) {
t.Errorf("%d: toBool(true) b=%v, ok=%v -> result = false, want true", count, b, ok) t.Errorf("%d: toBool(true) b=%v, ok=%v -> result = false, want true", count, b, ok)
failed++ failed++
@ -72,7 +72,7 @@ func TestIsString(t *testing.T) {
} }
count++ count++
b, ok = toBool("abc") b, ok = ToBool("abc")
if !(ok && b) { if !(ok && b) {
t.Errorf("%d: toBool(\"abc\") b=%v, ok=%v -> result = false, want true", count, b, ok) t.Errorf("%d: toBool(\"abc\") b=%v, ok=%v -> result = false, want true", count, b, ok)
failed++ failed++
@ -81,7 +81,7 @@ func TestIsString(t *testing.T) {
} }
count++ count++
b, ok = toBool([]int{}) b, ok = ToBool([]int{})
if ok { if ok {
t.Errorf("%d: toBool([]) b=%v, ok=%v -> result = true, want false", count, b, ok) t.Errorf("%d: toBool([]) b=%v, ok=%v -> result = true, want false", count, b, ok)
failed++ failed++
@ -97,7 +97,7 @@ func TestToIntOk(t *testing.T) {
wantValue := int(64) wantValue := int(64)
wantErr := error(nil) wantErr := error(nil)
gotValue, gotErr := toInt(source, "test") gotValue, gotErr := ToInt(source, "test")
if gotErr != nil || gotValue != wantValue { if gotErr != nil || gotValue != wantValue {
t.Errorf("toInt(%v, \"test\") gotValue=%v, gotErr=%v -> wantValue=%v, wantErr=%v", t.Errorf("toInt(%v, \"test\") gotValue=%v, gotErr=%v -> wantValue=%v, wantErr=%v",
@ -110,7 +110,7 @@ func TestToIntErr(t *testing.T) {
wantValue := 0 wantValue := 0
wantErr := errors.New(`test expected integer, got uint64 (64)`) wantErr := errors.New(`test expected integer, got uint64 (64)`)
gotValue, gotErr := toInt(source, "test") gotValue, gotErr := ToInt(source, "test")
if gotErr.Error() != wantErr.Error() || gotValue != wantValue { if gotErr.Error() != wantErr.Error() || gotValue != wantValue {
t.Errorf("toInt(%v, \"test\") gotValue=%v, gotErr=%v -> wantValue=%v, wantErr=%v", t.Errorf("toInt(%v, \"test\") gotValue=%v, gotErr=%v -> wantValue=%v, wantErr=%v",

4
utils.go
View File

@ -86,7 +86,7 @@ func numAsFloat(v any) (f float64) {
return return
} }
func toBool(v any) (b bool, ok bool) { func ToBool(v any) (b bool, ok bool) {
ok = true ok = true
switch x := v.(type) { switch x := v.(type) {
case string: case string:
@ -201,7 +201,7 @@ func CloneFilteredMap[K comparable, V any](source map[K]V, filter func(key K) (a
return CopyFilteredMap(dest, source, filter) return CopyFilteredMap(dest, source, filter)
} }
func toInt(value any, description string) (i int, err error) { func ToInt(value any, description string) (i int, err error) {
if valueInt64, ok := value.(int64); ok { if valueInt64, ok := value.(int64); ok {
i = int(valueInt64) i = int(valueInt64)
} else if valueInt, ok := value.(int); ok { } else if valueInt, ok := value.(int); ok {