diff options
Diffstat (limited to 'src/pkg/go/parser')
| -rw-r--r-- | src/pkg/go/parser/interface.go | 26 | ||||
| -rw-r--r-- | src/pkg/go/parser/parser_test.go | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/pkg/go/parser/interface.go b/src/pkg/go/parser/interface.go index f0a323b7a..193a1e7d8 100644 --- a/src/pkg/go/parser/interface.go +++ b/src/pkg/go/parser/interface.go @@ -7,14 +7,14 @@ package parser import ( - "bytes"; - "fmt"; - "go/ast"; - "go/scanner"; - "io"; - "os"; - pathutil "path"; - "strings"; + "bytes"; + "fmt"; + "go/ast"; + "go/scanner"; + "io"; + "os"; + pathutil "path"; + "strings"; ) @@ -63,7 +63,7 @@ func ParseExpr(filename string, src interface{}) (ast.Expr, os.Error) { var p parser; p.init(filename, data, 0); - x := p.parseExpr(); // TODO 6g bug - function call order in expr lists + x := p.parseExpr(); // TODO 6g bug - function call order in expr lists return x, p.GetError(scanner.Sorted); } @@ -81,7 +81,7 @@ func ParseStmtList(filename string, src interface{}) ([]ast.Stmt, os.Error) { var p parser; p.init(filename, data, 0); - list := p.parseStmtList(); // TODO 6g bug - function call order in expr lists + list := p.parseStmtList(); // TODO 6g bug - function call order in expr lists return list, p.GetError(scanner.Sorted); } @@ -99,7 +99,7 @@ func ParseDeclList(filename string, src interface{}) ([]ast.Decl, os.Error) { var p parser; p.init(filename, data, 0); - list := p.parseDeclList(); // TODO 6g bug - function call order in expr lists + list := p.parseDeclList(); // TODO 6g bug - function call order in expr lists return list, p.GetError(scanner.Sorted); } @@ -130,7 +130,7 @@ func ParseFile(filename string, src interface{}, mode uint) (*ast.File, os.Error var p parser; p.init(filename, data, mode); - prog := p.parseFile(); // TODO 6g bug - function call order in expr lists + prog := p.parseFile(); // TODO 6g bug - function call order in expr lists return prog, p.GetError(scanner.NoMultiples); } @@ -158,7 +158,7 @@ func ParsePkgFile(pkgname, filename string, mode uint) (*ast.File, os.Error) { } // ignore flags that control partial parsing - return ParseFile(filename, src, mode &^ (PackageClauseOnly | ImportsOnly)); + return ParseFile(filename, src, mode&^(PackageClauseOnly | ImportsOnly)); } diff --git a/src/pkg/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go index bb07f2928..fc366bcc3 100644 --- a/src/pkg/go/parser/parser_test.go +++ b/src/pkg/go/parser/parser_test.go @@ -10,7 +10,7 @@ import ( ) -var illegalInputs = []interface{} { +var illegalInputs = []interface{}{ nil, 3.14, []byte(nil), @@ -28,7 +28,7 @@ func TestParseIllegalInputs(t *testing.T) { } -var validPrograms = []interface{} { +var validPrograms = []interface{}{ `package main`, `package main import "fmt" func main() { fmt.Println("Hello, World!") }`, } @@ -44,7 +44,7 @@ func TestParseValidPrograms(t *testing.T) { } -var validFiles = []string { +var validFiles = []string{ "parser.go", "parser_test.go", } |
