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

formatter.go: typeName() renamed as TypeName()

Browse Source
This commit is contained in:
Celestino Amoroso 2024-06-10 09:37:27 +02:00
parent 54041552d4
commit 1757298eb4
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common-errors.go
View File

@ -25,11 +25,11 @@ func errTooMuchParams(funcName string, maxArgs, argCount int) (err error) {
// --- General errors // --- General errors
func errCantConvert(funcName string, value any, kind string) error { func errCantConvert(funcName string, value any, kind string) error {
return fmt.Errorf("%s(): can't convert %s to %s", funcName, typeName(value), kind) return fmt.Errorf("%s(): can't convert %s to %s", funcName, TypeName(value), kind)
} }
func errExpectedGot(funcName string, kind string, value any) error { func errExpectedGot(funcName string, kind string, value any) error {
return fmt.Errorf("%s() expected %s, got %s (%v)", funcName, kind, typeName(value), value) return fmt.Errorf("%s() expected %s, got %s (%v)", funcName, kind, TypeName(value), value)
} }
func errFuncDivisionByZero(funcName string) error { func errFuncDivisionByZero(funcName string) error {
@ -47,9 +47,9 @@ func errMissingRequiredParameter(funcName, paramName string) error {
} }
func errInvalidParameterValue(funcName, paramName string, paramValue any) error { func errInvalidParameterValue(funcName, paramName string, paramValue any) error {
return fmt.Errorf("%s() invalid value %s (%v) for parameter %q", funcName, typeName(paramValue), paramValue, paramName) return fmt.Errorf("%s() invalid value %s (%v) for parameter %q", funcName, TypeName(paramValue), paramValue, paramName)
} }
func errWrongParamType(funcName, paramName, paramType string, paramValue any) error { func errWrongParamType(funcName, paramName, paramType string, paramValue any) error {
return fmt.Errorf("%s() the %q parameter must be a %s, got a %s (%v)", funcName, paramName, paramType, typeName(paramValue), paramValue) return fmt.Errorf("%s() the %q parameter must be a %s, got a %s (%v)", funcName, paramName, paramType, TypeName(paramValue), paramValue)
} }

2
formatter.go
View File

@ -51,7 +51,7 @@ type Typer interface {
TypeName() string TypeName() string
} }
func typeName(v any) (name string) { func TypeName(v any) (name string) {
if v == nil { if v == nil {
name = "nil" name = "nil"
} else if typer, ok := v.(Typer); ok { } else if typer, ok := v.(Typer); ok {

2
import-utils.go
View File

@ -20,7 +20,7 @@ const (
func checkStringParamExpected(funcName string, paramValue any, paramPos int) (err error) { func checkStringParamExpected(funcName string, paramValue any, paramPos int) (err error) {
if !(IsString(paramValue) /*|| isList(paramValue)*/) { if !(IsString(paramValue) /*|| isList(paramValue)*/) {
err = fmt.Errorf("%s(): param nr %d has wrong type %s, string expected", funcName, paramPos+1, typeName(paramValue)) err = fmt.Errorf("%s(): param nr %d has wrong type %s, string expected", funcName, paramPos+1, TypeName(paramValue))
} }
return return
} }

4
operator-assign.go
View File

@ -28,7 +28,7 @@ func assignCollectionItem(ctx ExprContext, collectionTerm, keyListTerm *term, va
if keyListValue, err = keyListTerm.compute(ctx); err != nil { if keyListValue, err = keyListTerm.compute(ctx); err != nil {
return return
} else if keyList, ok = keyListValue.(*ListType); !ok || len(*keyList) != 1 { } else if keyList, ok = keyListValue.(*ListType); !ok || len(*keyList) != 1 {
err = keyListTerm.Errorf("index/key specification expected, got %v [%s]", keyListValue, typeName(keyListValue)) err = keyListTerm.Errorf("index/key specification expected, got %v [%s]", keyListValue, TypeName(keyListValue))
return return
} }
if keyValue = (*keyList)[0]; keyValue == nil { if keyValue = (*keyList)[0]; keyValue == nil {
@ -41,7 +41,7 @@ func assignCollectionItem(ctx ExprContext, collectionTerm, keyListTerm *term, va
if index, ok := keyValue.(int64); ok { if index, ok := keyValue.(int64); ok {
err = collection.setItem(index, value) err = collection.setItem(index, value)
} else { } else {
err = keyListTerm.Errorf("integer expected, got %v [%s]", keyValue, typeName(keyValue)) err = keyListTerm.Errorf("integer expected, got %v [%s]", keyValue, TypeName(keyValue))
} }
case *DictType: case *DictType:
err = collection.setItem(keyValue, value) err = collection.setItem(keyValue, value)

2
operator-builtin.go
View File

@ -41,7 +41,7 @@ func evalBuiltin(ctx ExprContext, self *term) (v any, err error) {
break break
} }
} else { } else {
err = self.Errorf("expected string at item nr %d, got %s", it.Index()+1, typeName(moduleSpec)) err = self.Errorf("expected string at item nr %d, got %s", it.Index()+1, TypeName(moduleSpec))
break break
} }
} }

2
operator-plugin.go
View File

@ -38,7 +38,7 @@ func evalPlugin(ctx ExprContext, self *term) (v any, err error) {
} }
count++ count++
} else { } else {
err = self.Errorf("expected string as item nr %d, got %s", it.Index()+1, typeName(moduleSpec)) err = self.Errorf("expected string as item nr %d, got %s", it.Index()+1, TypeName(moduleSpec))
break break
} }
} }

2
t_parser_test.go
View File

@ -203,7 +203,7 @@ func doTest(t *testing.T, section string, input *inputType, count int) (good boo
eq := reflect.DeepEqual(gotResult, input.wantResult) eq := reflect.DeepEqual(gotResult, input.wantResult)
if !eq /*gotResult != input.wantResult*/ { if !eq /*gotResult != input.wantResult*/ {
t.Errorf("%d: %q -> result = %v [%s], want = %v [%s]", count, input.source, gotResult, typeName(gotResult), input.wantResult, typeName(input.wantResult)) t.Errorf("%d: %q -> result = %v [%s], want = %v [%s]", count, input.source, gotResult, TypeName(gotResult), input.wantResult, TypeName(input.wantResult))
good = false good = false
} }

8
term.go
View File

@ -156,15 +156,15 @@ func (self *term) toInt(computedValue any, valueDescription string) (i int, err
if index64, ok := computedValue.(int64); ok { if index64, ok := computedValue.(int64); ok {
i = int(index64) i = int(index64)
} else { } else {
err = self.Errorf("%s, got %s (%v)", valueDescription, typeName(computedValue), computedValue) err = self.Errorf("%s, got %s (%v)", valueDescription, TypeName(computedValue), computedValue)
} }
return return
} }
func (self *term) errIncompatibleTypes(leftValue, rightValue any) error { func (self *term) errIncompatibleTypes(leftValue, rightValue any) error {
leftType := typeName(leftValue) leftType := TypeName(leftValue)
leftText := getFormatted(leftValue, Truncate) leftText := getFormatted(leftValue, Truncate)
rightType := typeName(rightValue) rightType := TypeName(rightValue)
rightText := getFormatted(rightValue, Truncate) rightText := getFormatted(rightValue, Truncate)
return self.tk.Errorf( return self.tk.Errorf(
"left operand '%s' [%s] and right operand '%s' [%s] are not compatible with operator %q", "left operand '%s' [%s] and right operand '%s' [%s] are not compatible with operator %q",
@ -176,7 +176,7 @@ func (self *term) errIncompatibleTypes(leftValue, rightValue any) error {
func (self *term) errIncompatibleType(value any) error { func (self *term) errIncompatibleType(value any) error {
return self.tk.Errorf( return self.tk.Errorf(
"prefix/postfix operator %q do not support operand '%v' [%s]", "prefix/postfix operator %q do not support operand '%v' [%s]",
self.source(), value, typeName(value)) self.source(), value, TypeName(value))
} }
func (self *term) Errorf(template string, args ...any) (err error) { func (self *term) Errorf(template string, args ...any) (err error) {

2
utils.go
View File

@ -207,7 +207,7 @@ func toInt(value any, description string) (i int, err error) {
} else if valueInt, ok := value.(int); ok { } else if valueInt, ok := value.(int); ok {
i = valueInt i = valueInt
} else { } else {
err = fmt.Errorf("%s expected integer, got %s (%v)", description, typeName(value), value) err = fmt.Errorf("%s expected integer, got %s (%v)", description, TypeName(value), value)
} }
return return
} }