diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
| commit | c924cab2fd8932bdfb107c4ca7d26128ba56f19e (patch) | |
| tree | 0eea6430e211564fc331f66625373ec761837982 /libgo/go/text/template/parse/parse.go | |
| parent | 4c15f6d5728cb694d7d954b2c20409fdc0400b9e (diff) | |
| parent | 3cef948a814542119083003a3c35a24e036230b6 (diff) | |
| download | gcc-hjl/x32/addr32.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/addr32hjl/x32/addr32
Diffstat (limited to 'libgo/go/text/template/parse/parse.go')
| -rw-r--r-- | libgo/go/text/template/parse/parse.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/go/text/template/parse/parse.go b/libgo/go/text/template/parse/parse.go index d67b3888085..c0087b2785b 100644 --- a/libgo/go/text/template/parse/parse.go +++ b/libgo/go/text/template/parse/parse.go @@ -326,7 +326,7 @@ func (t *Tree) pipeline(context string) (pipe *PipeNode) { for { if v := t.peek(); v.typ == itemVariable { t.next() - if next := t.peek(); next.typ == itemColonEquals || next.typ == itemChar { + if next := t.peek(); next.typ == itemColonEquals || (next.typ == itemChar && next.val == ",") { t.next() variable := newVariable(v.val) if len(variable.Ident) != 1 { |