qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 04:44:41 -07:00
Code Releases Activity

text/template: remove duplicate logic in conditional

Browse Source 
It looks like this conditional may have been refactored at some point,
but the logic was still very confusing. The outer conditional checks if
the function is variadic, so there's no need to verify that in the
result. Additionally, since the function isn't variadic, there is no
reason to permit the function call if the number of input arguments is
less than the function signature requires.

Change-Id: Ia957cf83d1c900c08dd66384efcb74f0c368422e
Reviewed-on: https://go-review.googlesource.com/35491
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Seth Vargo 2017-01-19 13:19:22 -05:00 committed by Ian Lance Taylor
parent bed8129ee6
commit 50c7783f59
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/text/template/exec.go
View File

@ -628,7 +628,7 @@ func (s *state) evalCall(dot, fun reflect.Value, node parse.Node, name string, a
if numIn < numFixed { if numIn < numFixed {
s.errorf("wrong number of args for %s: want at least %d got %d", name, typ.NumIn()-1, len(args)) s.errorf("wrong number of args for %s: want at least %d got %d", name, typ.NumIn()-1, len(args))
} }
} else if numIn < typ.NumIn()-1 || !typ.IsVariadic() && numIn != typ.NumIn() { } else if numIn != typ.NumIn() {
s.errorf("wrong number of args for %s: want %d got %d", name, typ.NumIn(), len(args)) s.errorf("wrong number of args for %s: want %d got %d", name, typ.NumIn(), len(args))
} }
if !goodFunc(typ) { if !goodFunc(typ) {