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

operator-assign.go: some errors message changed to report the Expr's type names, not the Go ones

Browse Source
This commit is contained in:
Celestino Amoroso 2024-06-05 05:05:40 +02:00
parent 4e3af837e6
commit e4ded4f746
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
operator-assign.go
View File

@ -32,7 +32,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 [%T]", keyListValue, keyListValue) err = keyListTerm.Errorf("index/key specification expected, got %v [%s]", keyListValue, typeName(keyListValue))
return return
} }
keyValue = (*keyList)[0] keyValue = (*keyList)[0]
@ -42,7 +42,7 @@ func assignCollectionItem(ctx ExprContext, collectionTerm, keyListTerm *term, va
if index, ok := keyValue.(int64); ok { if index, ok := keyValue.(int64); ok {
err = assignListItem(collection, index, value) err = assignListItem(collection, index, value)
} else { } else {
err = keyListTerm.Errorf("integer expected, got %v [%T]", keyValue, keyValue) err = keyListTerm.Errorf("integer expected, got %v [%s]", keyValue, typeName(keyValue))
} }
case *DictType: case *DictType:
collection.setItem(keyValue, value) collection.setItem(keyValue, value)
@ -174,6 +174,9 @@ func evalAssign(ctx ExprContext, self *term) (v any, err error) {
//ctx.UnsafeSetVar(leftTerm.source(), v) //ctx.UnsafeSetVar(leftTerm.source(), v)
} }
} }
if err != nil {
v=nil
}
return return
} }