diff options
author | Rob Pike <r@golang.org> | 2014-09-22 17:48:13 -0700 |
---|---|---|
committer | Rob Pike <r@golang.org> | 2014-09-22 17:48:13 -0700 |
commit | 5bd50e024b501287b39c8f6e224982e89af3af7a (patch) | |
tree | 5fa00ca9c39270171b0927075c36471af723aab9 /src | |
parent | d6d3562761755f7b74776abe4b39e14464099484 (diff) | |
download | go-5bd50e024b501287b39c8f6e224982e89af3af7a.tar.gz |
text/template: type-check chained node as argument
Was just a missing case (literally) in the type checker.
Fixes issue 8473.
LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://codereview.appspot.com/142460043
Diffstat (limited to 'src')
-rw-r--r-- | src/text/template/exec.go | 2 | ||||
-rw-r--r-- | src/text/template/exec_test.go | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/text/template/exec.go b/src/text/template/exec.go index 8e155d478..f6eed662b 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -636,6 +636,8 @@ func (s *state) evalArg(dot reflect.Value, typ reflect.Type, n parse.Node) refle return s.validateType(s.evalPipeline(dot, arg), typ) case *parse.IdentifierNode: return s.evalFunction(dot, arg, arg, nil, zero) + case *parse.ChainNode: + return s.validateType(s.evalChainNode(dot, arg, nil, zero), typ) } switch typ.Kind() { case reflect.Bool: diff --git a/src/text/template/exec_test.go b/src/text/template/exec_test.go index 3bffcc159..e2cf2d370 100644 --- a/src/text/template/exec_test.go +++ b/src/text/template/exec_test.go @@ -176,6 +176,12 @@ func (t *T) Method3(v interface{}) string { return fmt.Sprintf("Method3: %v", v) } +func (t *T) Copy() *T { + n := new(T) + *n = *t + return n +} + func (t *T) MAdd(a int, b []int) []int { v := make([]int, len(b)) for i, x := range b { @@ -519,6 +525,8 @@ var execTests = []execTest{ {"bug12xE", "{{printf `%T` 0xEE}}", "int", T{}, true}, {"bug12Xe", "{{printf `%T` 0Xef}}", "int", T{}, true}, {"bug12XE", "{{printf `%T` 0XEE}}", "int", T{}, true}, + // Chained nodes did not work as arguments. Issue 8473. + {"bug13", "{{print (.Copy).I}}", "17", tVal, true}, } func zeroArgs() string { |