diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
| commit | 2fd401c8f190f1fe43e51a7f726f6ed6119a1f96 (patch) | |
| tree | 7f76eff391f37fe6467ff4ffbc0c582c9959ea30 /libgo/go/template/parse.go | |
| parent | 02e9018f1616b23f1276151797216717b3564202 (diff) | |
| download | gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.zip gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.gz gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.bz2 | |
libgo: Update to weekly.2011-11-02.
From-SVN: r181964
Diffstat (limited to 'libgo/go/template/parse.go')
| -rw-r--r-- | libgo/go/template/parse.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libgo/go/template/parse.go b/libgo/go/template/parse.go index 3068a77..2fbd37f 100644 --- a/libgo/go/template/parse.go +++ b/libgo/go/template/parse.go @@ -5,7 +5,6 @@ package template import ( - "os" "reflect" "template/parse" ) @@ -62,7 +61,7 @@ func (t *Template) Funcs(funcMap FuncMap) *Template { // Parse parses the template definition string to construct an internal // representation of the template for execution. -func (t *Template) Parse(s string) (tmpl *Template, err os.Error) { +func (t *Template) Parse(s string) (tmpl *Template, err error) { t.Tree, err = parse.New(t.name).Parse(s, t.leftDelim, t.rightDelim, t.parseFuncs, builtins) if err != nil { return nil, err @@ -74,7 +73,7 @@ func (t *Template) Parse(s string) (tmpl *Template, err os.Error) { // representation of the template for execution. It also adds the template // to the set. // Function bindings are checked against those in the set. -func (t *Template) ParseInSet(s string, set *Set) (tmpl *Template, err os.Error) { +func (t *Template) ParseInSet(s string, set *Set) (tmpl *Template, err error) { var setFuncs FuncMap if set != nil { setFuncs = set.parseFuncs |