diff options
| author | David Symonds <dsymonds@golang.org> | 2015-10-01 14:21:37 +1000 |
|---|---|---|
| committer | David Symonds <dsymonds@golang.org> | 2015-10-01 04:36:35 +0000 |
| commit | 090843b65074a306e4e807bdca1fbb7262ffce26 (patch) | |
| tree | 92087451a5f38718bbbbacc6b86822a6afa609a1 /src/text/template/exec.go | |
| parent | 79480ca07a1515223d49031c59ae37b662f45b5e (diff) | |
| download | go-090843b65074a306e4e807bdca1fbb7262ffce26.tar.xz | |
text/template: change IsTrue to take interface{} instead of reflect.Value.
This is a follow-up to a326c3e to avoid reflect being in the API.
Fixes #12801.
Change-Id: Ic4c2e592e2c35b5911f75d88f1d9c44787c80f30
Reviewed-on: https://go-review.googlesource.com/15240
Run-TryBot: David Symonds <dsymonds@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
Diffstat (limited to 'src/text/template/exec.go')
| -rw-r--r-- | src/text/template/exec.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/text/template/exec.go b/src/text/template/exec.go index 8d74255070..16839a8d6d 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -242,7 +242,7 @@ func (s *state) walk(dot reflect.Value, node parse.Node) { func (s *state) walkIfOrWith(typ parse.NodeType, dot reflect.Value, pipe *parse.PipeNode, list, elseList *parse.ListNode) { defer s.pop(s.mark()) val := s.evalPipeline(dot, pipe) - truth, ok := IsTrue(val) + truth, ok := isTrue(val) if !ok { s.errorf("if/with can't use %v", val) } @@ -260,7 +260,11 @@ func (s *state) walkIfOrWith(typ parse.NodeType, dot reflect.Value, pipe *parse. // IsTrue reports whether the value is 'true', in the sense of not the zero of its type, // and whether the value has a meaningful truth value. This is the definition of // truth used by if and other such actions. -func IsTrue(val reflect.Value) (truth, ok bool) { +func IsTrue(val interface{}) (truth, ok bool) { + return isTrue(reflect.ValueOf(val)) +} + +func isTrue(val reflect.Value) (truth, ok bool) { if !val.IsValid() { // Something like var x interface{}, never set. It's a form of nil. return false, true |
