From b6bac1c0a501353f418df309f56ca0cdec39b214 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Wed, 16 Dec 2009 14:12:24 -0800 Subject: [PATCH] Don't ignore flags controlling the amount of source code parsed in parser's ParsePkgFile and ParsePackage functions. R=rsc CC=golang-dev, rog https://golang.org/cl/180070 --- src/pkg/exp/parser/interface.go | 10 +++++----- src/pkg/go/parser/interface.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pkg/exp/parser/interface.go b/src/pkg/exp/parser/interface.go index 495c0c29eef..b85ad70904f 100644 --- a/src/pkg/exp/parser/interface.go +++ b/src/pkg/exp/parser/interface.go @@ -135,8 +135,7 @@ func ParseFile(filename string, src interface{}, mode uint) (*ast.File, os.Error // ParsePkgFile parses the file specified by filename and returns the // corresponding AST. If the file cannot be read, has syntax errors, or // does not belong to the package (i.e., pkgname != "" and the package -// name in the file doesn't match pkkname), an error is returned. Mode -// flags that control the amount of source text parsed are ignored. +// name in the file doesn't match pkkname), an error is returned. // func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { src, err := ioutil.ReadFile(filename) @@ -152,10 +151,12 @@ func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { if prog.Name.Value != pkgname { return nil, os.NewError(fmt.Sprintf("multiple packages found: %s, %s", prog.Name.Value, pkgname)) } + if mode == PackageClauseOnly { + return prog, nil + } } - // ignore flags that control partial parsing - return ParseFile(filename, src, mode&^(PackageClauseOnly|ImportsOnly)) + return ParseFile(filename, src, mode) } @@ -164,7 +165,6 @@ func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { // restricted by providing a non-nil filter function; only the files with // os.Dir entries passing through the filter are considered. // If ParsePackage does not find exactly one package, it returns an error. -// Mode flags that control the amount of source text parsed are ignored. // func ParsePackage(path string, filter func(*os.Dir) bool, mode uint) (*ast.Package, os.Error) { fd, err := os.Open(path, os.O_RDONLY, 0) diff --git a/src/pkg/go/parser/interface.go b/src/pkg/go/parser/interface.go index b6fe4441e00..1c0514a78aa 100644 --- a/src/pkg/go/parser/interface.go +++ b/src/pkg/go/parser/interface.go @@ -135,8 +135,7 @@ func ParseFile(filename string, src interface{}, mode uint) (*ast.File, os.Error // ParsePkgFile parses the file specified by filename and returns the // corresponding AST. If the file cannot be read, has syntax errors, or // does not belong to the package (i.e., pkgname != "" and the package -// name in the file doesn't match pkkname), an error is returned. Mode -// flags that control the amount of source text parsed are ignored. +// name in the file doesn't match pkkname), an error is returned. // func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { src, err := ioutil.ReadFile(filename) @@ -152,10 +151,12 @@ func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { if prog.Name.Value != pkgname { return nil, os.NewError(fmt.Sprintf("multiple packages found: %s, %s", prog.Name.Value, pkgname)) } + if mode == PackageClauseOnly { + return prog, nil + } } - // ignore flags that control partial parsing - return ParseFile(filename, src, mode&^(PackageClauseOnly|ImportsOnly)) + return ParseFile(filename, src, mode) } @@ -164,7 +165,6 @@ func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { // restricted by providing a non-nil filter function; only the files with // os.Dir entries passing through the filter are considered. // If ParsePackage does not find exactly one package, it returns an error. -// Mode flags that control the amount of source text parsed are ignored. // func ParsePackage(path string, filter func(*os.Dir) bool, mode uint) (*ast.Package, os.Error) { fd, err := os.Open(path, os.O_RDONLY, 0)