diff options
author | Ondřej Surý <ondrej@sury.org> | 2011-09-13 12:00:31 +0200 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2011-09-13 12:00:31 +0200 |
commit | 04f99b387021a8ce32a8795360cba9beaf986a81 (patch) | |
tree | f806c632c5dec5bb83190946d6d8ff8bd33c0e57 /src/cmd/godoc/parser.go | |
parent | d9514677ddaa705852cbba5034cb6d284261b53a (diff) | |
download | golang-04f99b387021a8ce32a8795360cba9beaf986a81.tar.gz |
Imported Upstream version 2011.09.07upstream-weekly/2011.09.07
Diffstat (limited to 'src/cmd/godoc/parser.go')
-rw-r--r-- | src/cmd/godoc/parser.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cmd/godoc/parser.go b/src/cmd/godoc/parser.go index da4b3853c..cc1780a4b 100644 --- a/src/cmd/godoc/parser.go +++ b/src/cmd/godoc/parser.go @@ -17,18 +17,18 @@ import ( "path/filepath" ) +func parseFile(fset *token.FileSet, filename string, mode uint) (*ast.File, os.Error) { + src, err := fs.ReadFile(filename) + if err != nil { + return nil, err + } + return parser.ParseFile(fset, filename, src, mode) +} + func parseFiles(fset *token.FileSet, filenames []string) (pkgs map[string]*ast.Package, first os.Error) { pkgs = make(map[string]*ast.Package) for _, filename := range filenames { - src, err := fs.ReadFile(filename) - if err != nil { - if first == nil { - first = err - } - continue - } - - file, err := parser.ParseFile(fset, filename, src, parser.ParseComments) + file, err := parseFile(fset, filename, parser.ParseComments) if err != nil { if first == nil { first = err |