diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-16 11:17:15 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-16 11:17:15 +0000 |
| commit | c2e9c1da57c35f46052398ab31707ceb2dfc4e09 (patch) | |
| tree | afd93279258b2ca1d846fdca1df67587efe6faad /libgo/go/html/template/escape.go | |
| parent | 56664e5da23e1ca0072b690b206c297484897bd3 (diff) | |
| download | gcc-c2e9c1da57c35f46052398ab31707ceb2dfc4e09.tar.gz | |
2012-01-16 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 183204 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@183208 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/html/template/escape.go')
| -rw-r--r-- | libgo/go/html/template/escape.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libgo/go/html/template/escape.go b/libgo/go/html/template/escape.go index 2f6be3b6c21..c6f723ae4a4 100644 --- a/libgo/go/html/template/escape.go +++ b/libgo/go/html/template/escape.go @@ -486,9 +486,17 @@ func (e *escaper) escapeTree(c context, name string, line int) (context, string) } t := e.template(name) if t == nil { + // Two cases: The template exists but is empty, or has never been mentioned at + // all. Distinguish the cases in the error messages. + if e.tmpl.set[name] != nil { + return context{ + state: stateError, + err: errorf(ErrNoSuchTemplate, line, "%q is an incomplete or empty template", name), + }, dname + } return context{ state: stateError, - err: errorf(ErrNoSuchTemplate, line, "no such template %s", name), + err: errorf(ErrNoSuchTemplate, line, "no such template %q", name), }, dname } if dname != name { |