html/template: simplify ExecuteTemplate a little

Allow the text template to handle the error case of no template
with the given name.
Simplification suggested by Mike Samuel.

R=mikesamuel
CC=golang-dev
https://golang.org/cl/5437147

diff --git a/src/pkg/html/template/template.go b/src/pkg/html/template/template.go
index f05ca190f739829cea60d5eb547d77314d939f85..fa2ed18874cc9f26f73b231e18ceda987d3aa409 100644 (file)
--- a/src/pkg/html/template/template.go
+++ b/src/pkg/html/template/template.go
@@ -47,23 +47,22 @@ func (t *Template) Execute(wr io.Writer, data interface{}) (err error) {
        return t.text.Execute(wr, data)
 }
 
-// ExecuteTemplate applies the template associated with t that has the given name
-// to the specified data object and writes the output to wr.
+// ExecuteTemplate applies the template associated with t that has the given
+// name to the specified data object and writes the output to wr.
 func (t *Template) ExecuteTemplate(wr io.Writer, name string, data interface{}) (err error) {
        t.nameSpace.mu.Lock()
        tmpl := t.set[name]
-       if tmpl == nil {
-               t.nameSpace.mu.Unlock()
-               return fmt.Errorf("template: no template %q associated with template %q", name, t.Name())
+       if (tmpl == nil) != (t.text.Lookup(name) == nil) {
+               panic("html/template internal error: template escaping out of sync")
        }
-       if !tmpl.escaped {
+       if tmpl != nil && !tmpl.escaped {
                err = escapeTemplates(tmpl, name)
        }
        t.nameSpace.mu.Unlock()
        if err != nil {
                return
        }
-       return tmpl.text.ExecuteTemplate(wr, name, data)
+       return t.text.ExecuteTemplate(wr, name, data)
 }
 
 // Parse parses a string into a template. Nested template definitions
@@ -106,7 +105,7 @@ func (t *Template) AddParseTree(name string, tree *parse.Tree) error {
 
 // Clone is unimplemented.
 func (t *Template) Clone(name string) error {
-       return fmt.Errorf("html/template: Add unimplemented")
+       return fmt.Errorf("html/template: Clone unimplemented")
 }
 
 // New allocates a new HTML template with the given name.