github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use cast.ToIntE for int conversions in substr and slicestr

Browse source 
It is less restrictive, and it is what is used in other template funcs.
This commit is contained in:
Bjørn Erik Pedersen 2015-08-15 15:47:16 +02:00
parent 5b51b3b9fb
commit dac9c0dae6
2 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tpl/template_funcs.go
View file

@ -128,24 +128,6 @@ func compareGetFloat(a interface{}, b interface{}) (float64, float64) {
return left, right return left, right
} }
// Taken out from Substr, to be used by Slicestr too.
func toInt(v interface{}, message string) (int, error) {
switch i := v.(type) {
case int:
return i, nil
case int8:
return int(i), nil
case int16:
return int(i), nil
case int32:
return int(i), nil
case int64:
return int(i), nil
default:
return 0, errors.New(message)
}
}
// Slicing in Slicestr is done by specifying a half-open range with // Slicing in Slicestr is done by specifying a half-open range with
// two indices, start and end. 1 and 4 creates a slice including elements 1 through 3. // two indices, start and end. 1 and 4 creates a slice including elements 1 through 3.
// The end index can be omitted, it defaults to the string's length. // The end index can be omitted, it defaults to the string's length.
@ -160,13 +142,13 @@ func Slicestr(a interface{}, startEnd ...interface{}) (string, error) {
argNum := len(startEnd) argNum := len(startEnd)
if argNum > 0 { if argNum > 0 {
if argStart, err = toInt(startEnd[0], "start argument must be integer"); err != nil { if argStart, err = cast.ToIntE(startEnd[0]); err != nil {
return "", err return "", errors.New("start argument must be integer")
} }
} }
if argNum > 1 { if argNum > 1 {
if argEnd, err = toInt(startEnd[1], "end argument must be integer"); err != nil { if argEnd, err = cast.ToIntE(startEnd[1]); err != nil {
return "", err return "", errors.New("end argument must be integer")
} }
} }
@ -219,16 +201,16 @@ func Substr(a interface{}, nums ...interface{}) (string, error) {
case 0: case 0:
return "", errors.New("too less arguments") return "", errors.New("too less arguments")
case 1: case 1:
if start, err = toInt(nums[0], "start argument must be integer"); err != nil { if start, err = cast.ToIntE(nums[0]); err != nil {
return "", err return "", errors.New("start argument must be integer")
} }
length = len(asRunes) length = len(asRunes)
case 2: case 2:
if start, err = toInt(nums[0], "start argument must be integer"); err != nil { if start, err = cast.ToIntE(nums[0]); err != nil {
return "", err return "", errors.New("start argument must be integer")
} }
if length, err = toInt(nums[1], "length argument must be integer"); err != nil { if length, err = cast.ToIntE(nums[1]); err != nil {
return "", err return "", errors.New("length argument must be integer")
} }
default: default:
return "", errors.New("too many arguments") return "", errors.New("too many arguments")

6
tpl/template_funcs_test.go
View file

@ -437,9 +437,9 @@ func TestSubstr(t *testing.T) {
{123, 1, 3, "23"}, {123, 1, 3, "23"},
{1.2e3, 0, 4, "1200"}, {1.2e3, 0, 4, "1200"},
{tstNoStringer{}, 0, 1, false}, {tstNoStringer{}, 0, 1, false},
{"abcdef", 2.0, nil, false}, {"abcdef", 2.0, nil, "cdef"},
{"abcdef", 2.0, 2, false}, {"abcdef", 2.0, 2, "cd"},
{"abcdef", 2, 2.0, false}, {"abcdef", 2, 2.0, "cd"},
{"ĀĀĀ", 1, 2, "ĀĀ"}, // # issue 1333 {"ĀĀĀ", 1, 2, "ĀĀ"}, // # issue 1333
} { } {
var result string var result string