code review 186169: template: look inside interface values

template: look inside interface values

[rsc, 2010-01-15 21:39:29]

Hello r (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[r2, 2010-01-15 21:45:31]

LGTM

On 16/01/2010, at 8:39 AM, rsc@golang.org wrote:

> Reviewers: r,
> 
> Message:
> Hello r (cc: golang-dev@googlegroups.com),
> 
> I'd like you to review this change.
> 
> 
> Description:
> template: look inside interface values
> 
> Please review this at http://codereview.appspot.com/186169
> 
> Affected files:
>  M src/pkg/template/template.go
>  M src/pkg/template/template_test.go
> 
> 
> Index: src/pkg/template/template.go
> ===================================================================
> --- a/src/pkg/template/template.go
> +++ b/src/pkg/template/template.go
> @@ -723,6 +723,9 @@
> 		}
> 		return t.varValue(name, st.parent)
> 	}
> +	if iface, ok := field.(*reflect.InterfaceValue); ok && !iface.IsNil() {
> +		field = iface.Elem()
> +	}
> 	return field
> }
> 
> Index: src/pkg/template/template_test.go
> ===================================================================
> --- a/src/pkg/template/template_test.go
> +++ b/src/pkg/template/template_test.go
> @@ -44,6 +44,7 @@
> 	innermap      U
> 	stringmap     map[string]string
> 	bytes         []byte
> +	iface         interface{}
> }
> 
> func (s *S) pointerMethod() string { return "ptrmethod!" }
> @@ -353,6 +354,24 @@
> 		out: "stringresult\n" +
> 			"stringresult\n",
> 	},
> +
> +	// Interface values
> +
> +	&Test{
> +		in: "{iface}",
> +
> +		out: "[1 2 3]",
> +	},
> +	&Test{
> +		in: "{.repeated section iface}{@}{.alternates with} {.end}",
> +
> +		out: "1 2 3",
> +	},
> +	&Test{
> +		in: "{.section iface}{@}{.end}",
> +
> +		out: "[1 2 3]",
> +	},
> }
> 
> func TestAll(t *testing.T) {
> @@ -379,6 +398,7 @@
> 	s.stringmap["stringkey1"] = "stringresult" // the same value so repeated
section is order-independent
> 	s.stringmap["stringkey2"] = "stringresult"
> 	s.bytes = strings.Bytes("hello")
> +	s.iface = []int{1, 2, 3}
> 
> 	var buf bytes.Buffer
> 	for _, test := range tests {
> 
> 

[rsc, 2010-01-15 21:49:34]

*** Submitted as http://code.google.com/p/go/source/detail?r=f083a7a84a0f ***

template: look inside interface values

R=r
CC=golang-dev
http://codereview.appspot.com/186169