diff options
Diffstat (limited to 'src/text/template')
| -rw-r--r-- | src/text/template/exec.go | 8 | ||||
| -rw-r--r-- | src/text/template/funcs.go | 2 |
2 files changed, 7 insertions, 3 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 diff --git a/src/text/template/funcs.go b/src/text/template/funcs.go index 6eda731834..49e9e7419a 100644 --- a/src/text/template/funcs.go +++ b/src/text/template/funcs.go @@ -265,7 +265,7 @@ func call(fn interface{}, args ...interface{}) (interface{}, error) { // Boolean logic. func truth(a interface{}) bool { - t, _ := IsTrue(reflect.ValueOf(a)) + t, _ := IsTrue(a) return t } |