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

text/template: variables do not take arguments

Browse Source 
R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/5821044
This commit is contained in:
Rob Pike 2012-03-14 10:46:21 +11:00
parent b5021f3fe0
commit d6ad6f0e61
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pkg/text/template/exec.go
View File

@ -369,6 +369,7 @@ func (s *state) evalVariableNode(dot reflect.Value, v *parse.VariableNode, args
// $x.Field has $x as the first ident, Field as the second. Eval the var, then the fields.
value := s.varValue(v.Ident[0])
if len(v.Ident) == 1 {
s.notAFunction(args, final)
return value
}
return s.evalFieldChain(dot, value, v.Ident[1:], args, final)

4
src/pkg/text/template/exec_test.go
View File

@ -466,6 +466,10 @@ var execTests = []execTest{
{"bug6b", "{{vfunc .V0 .V0}}", "vfunc", tVal, true},
{"bug6c", "{{vfunc .V1 .V0}}", "vfunc", tVal, true},
{"bug6d", "{{vfunc .V1 .V1}}", "vfunc", tVal, true},
// Legal parse but illegal execution: non-function should have no arguments.
{"bug7a", "{{3 2}}", "", tVal, false},
{"bug7b", "{{$x := 1}}{{$x 2}}", "", tVal, false},
{"bug7c", "{{$x := 1}}{{3 | $x}}", "", tVal, false},
}
func zeroArgs() string {