diff options
| author | Wim <wim@42.be> | 2019-06-16 23:33:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-16 23:33:25 +0200 |
| commit | cb712ff37d3c20a21695e00c52fff213a6fd40b4 (patch) | |
| tree | 0ba0ee4f55bf6ace2656562465cc82d807e741b9 /vendor/github.com/d5/tengo/stdlib/fmt.go | |
| parent | f4ae61044888f591830e6c1be9a2bdb14f88943e (diff) | |
| download | matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.tar.gz matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.tar.bz2 matterbridge-msglm-cb712ff37d3c20a21695e00c52fff213a6fd40b4.zip | |
Update vendor (#852)
Diffstat (limited to 'vendor/github.com/d5/tengo/stdlib/fmt.go')
| -rw-r--r-- | vendor/github.com/d5/tengo/stdlib/fmt.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/vendor/github.com/d5/tengo/stdlib/fmt.go b/vendor/github.com/d5/tengo/stdlib/fmt.go index 9c75fc33..b8f64278 100644 --- a/vendor/github.com/d5/tengo/stdlib/fmt.go +++ b/vendor/github.com/d5/tengo/stdlib/fmt.go @@ -44,12 +44,12 @@ func fmtPrintf(args ...objects.Object) (ret objects.Object, err error) { return nil, nil } - formatArgs := make([]interface{}, numArgs-1, numArgs-1) - for idx, arg := range args[1:] { - formatArgs[idx] = objects.ToInterface(arg) + s, err := objects.Format(format.Value, args[1:]...) + if err != nil { + return nil, err } - fmt.Printf(format.Value, formatArgs...) + fmt.Print(s) return nil, nil } @@ -84,15 +84,9 @@ func fmtSprintf(args ...objects.Object) (ret objects.Object, err error) { return format, nil // okay to return 'format' directly as String is immutable } - formatArgs := make([]interface{}, numArgs-1, numArgs-1) - for idx, arg := range args[1:] { - formatArgs[idx] = objects.ToInterface(arg) - } - - s := fmt.Sprintf(format.Value, formatArgs...) - - if len(s) > tengo.MaxStringLen { - return nil, objects.ErrStringLimit + s, err := objects.Format(format.Value, args[1:]...) + if err != nil { + return nil, err } return &objects.String{Value: s}, nil |