cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-31 23:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

go.tools/go/loader: add Config.ParserMode configuration parameter.

Browse Source 
Existing tools use the default value of zero; their behaviour is unchanged.
(*Config).ParseFile is used only from tests.

LGTM=crawshaw, rsc, gri
R=crawshaw, gri, rsc
CC=golang-codereviews
https://golang.org/cl/79290044
This commit is contained in:
Alan Donovan 2014-03-27 12:50:26 -04:00
parent 8b161c33a9
commit 2414677bb9
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go/loader/loader.go
View File

@ -145,6 +145,10 @@ type Config struct {
// method of Config.
Fset *token.FileSet
// ParserMode specifies the mode to be used by the parser when
// loading source packages.
ParserMode parser.Mode
// TypeChecker contains options relating to the type checker.
//
// The supplied IgnoreFuncBodies is not used; the effective
@ -255,8 +259,8 @@ func (conf *Config) fset() *token.FileSet {
// ParseFile is a convenience function that invokes the parser using
// the Config's FileSet, which is initialized if nil.
//
func (conf *Config) ParseFile(filename string, src interface{}, mode parser.Mode) (*ast.File, error) {
return parser.ParseFile(conf.fset(), filename, src, mode)
func (conf *Config) ParseFile(filename string, src interface{}) (*ast.File, error) {
return parser.ParseFile(conf.fset(), filename, src, conf.ParserMode)
}
// FromArgsUsage is a partial usage message that applications calling
@ -340,7 +344,7 @@ func (conf *Config) FromArgs(args []string, xtest bool) (rest []string, err erro
// conf.CreatePkgs.
//
func (conf *Config) CreateFromFilenames(path string, filenames ...string) error {
files, err := parseFiles(conf.fset(), conf.build(), nil, ".", filenames...)
files, err := parseFiles(conf.fset(), conf.build(), nil, ".", filenames, conf.ParserMode)
if err != nil {
return err
}
@ -638,7 +642,7 @@ func (conf *Config) parsePackageFiles(path string, which rune) ([]*ast.File, err
default:
panic(which)
}
return parseFiles(conf.fset(), &ctxt, conf.DisplayPath, bp.Dir, filenames...)
return parseFiles(conf.fset(), &ctxt, conf.DisplayPath, bp.Dir, filenames, conf.ParserMode)
}
// doImport imports the package denoted by path.

4
go/loader/util.go
View File

@ -21,7 +21,7 @@ import (
// I/O is done via ctxt, which may specify a virtual file system.
// displayPath is used to transform the filenames attached to the ASTs.
//
func parseFiles(fset *token.FileSet, ctxt *build.Context, displayPath func(string) string, dir string, files ...string) ([]*ast.File, error) {
func parseFiles(fset *token.FileSet, ctxt *build.Context, displayPath func(string) string, dir string, files []string, mode parser.Mode) ([]*ast.File, error) {
if displayPath == nil {
displayPath = func(path string) string { return path }
}
@ -56,7 +56,7 @@ func parseFiles(fset *token.FileSet, ctxt *build.Context, displayPath func(strin
errors[i] = err
return
}
parsed[i], errors[i] = parser.ParseFile(fset, displayPath(file), rd, 0)
parsed[i], errors[i] = parser.ParseFile(fset, displayPath(file), rd, mode)
}(i, file)
}
wg.Wait()

2
go/pointer/example_test.go
View File

@ -45,7 +45,7 @@ func main() {
conf := loader.Config{SourceImports: true}
// Parse the input file.
file, err := conf.ParseFile("myprog.go", myprog, 0)
file, err := conf.ParseFile("myprog.go", myprog)
if err != nil {
fmt.Print(err) // parse error
return

2
go/pointer/pointer_test.go
View File

@ -154,7 +154,7 @@ func doOneInput(input, filename string) bool {
conf := loader.Config{SourceImports: true}
// Parsing.
f, err := conf.ParseFile(filename, input, 0)
f, err := conf.ParseFile(filename, input)
if err != nil {
fmt.Println(err)
return false

4
go/ssa/builder_test.go
View File

@ -42,7 +42,7 @@ func main() {
// Create a single-file main package.
var conf loader.Config
f, err := conf.ParseFile("<input>", test, 0)
f, err := conf.ParseFile("<input>", test)
if err != nil {
t.Error(err)
return
@ -211,7 +211,7 @@ func TestTypesWithMethodSets(t *testing.T) {
for _, test := range tests {
// Create a single-file main package.
var conf loader.Config
f, err := conf.ParseFile("<input>", test.input, 0)
f, err := conf.ParseFile("<input>", test.input)
if err != nil {
t.Errorf("test %q: %s", test.input[:15], err)
continue

2
go/ssa/example_test.go
View File

@ -43,7 +43,7 @@ func main() {
var conf loader.Config
// Parse the input file.
file, err := conf.ParseFile("hello.go", hello, 0)
file, err := conf.ParseFile("hello.go", hello)
if err != nil {
fmt.Print(err) // parse error
return

8
go/ssa/source_test.go
View File

@ -24,8 +24,8 @@ import (
)
func TestObjValueLookup(t *testing.T) {
var conf loader.Config
f, err := conf.ParseFile("testdata/objlookup.go", nil, parser.ParseComments)
conf := loader.Config{ParserMode: parser.ParseComments}
f, err := conf.ParseFile("testdata/objlookup.go", nil)
if err != nil {
t.Error(err)
return
@ -186,8 +186,8 @@ func checkVarValue(t *testing.T, prog *ssa.Program, pkg *ssa.Package, ref []ast.
// Ensure that, in debug mode, we can determine the ssa.Value
// corresponding to every ast.Expr.
func TestValueForExpr(t *testing.T) {
var conf loader.Config
f, err := conf.ParseFile("testdata/valueforexpr.go", nil, parser.ParseComments)
conf := loader.Config{ParserMode: parser.ParseComments}
f, err := conf.ParseFile("testdata/valueforexpr.go", nil)
if err != nil {
t.Error(err)
return

4
go/ssa/ssautil/switch_test.go
View File

@ -15,8 +15,8 @@ import (
)
func TestSwitches(t *testing.T) {
var conf loader.Config
f, err := conf.ParseFile("testdata/switches.go", nil, parser.ParseComments)
conf := loader.Config{ParserMode: parser.ParseComments}
f, err := conf.ParseFile("testdata/switches.go", nil)
if err != nil {
t.Error(err)
return