mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
cmd/compile/internal/syntax: fix error handling for Read/Parse calls
- define syntax.Error for cleaner error reporting - abort parsing after first error if no error handler is installed - make sure to always report the first error, if any - document behavior of API calls - while at it: rename ReadXXX -> ParseXXX (clearer) - adjust cmd/compile noder.go accordingly Fixes #17774. Change-Id: I7893eedea454a64acd753e32f7a8bf811ddbb03c Reviewed-on: https://go-review.googlesource.com/32950 Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
parent
ad020477f4
commit
60a9bf9f95
8 changed files with 126 additions and 85 deletions
|
|
@ -22,7 +22,7 @@ var src = flag.String("src", "parser.go", "source file to parse")
|
|||
var verify = flag.Bool("verify", false, "verify idempotent printing")
|
||||
|
||||
func TestParse(t *testing.T) {
|
||||
_, err := ReadFile(*src, nil, nil, 0)
|
||||
_, err := ParseFile(*src, nil, nil, 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -52,7 +52,7 @@ func TestStdLib(t *testing.T) {
|
|||
if debug {
|
||||
fmt.Printf("parsing %s\n", filename)
|
||||
}
|
||||
ast, err := ReadFile(filename, nil, nil, 0)
|
||||
ast, err := ParseFile(filename, nil, nil, 0)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
return
|
||||
|
|
@ -133,7 +133,7 @@ func verifyPrint(filename string, ast1 *File) {
|
|||
panic(err)
|
||||
}
|
||||
|
||||
ast2, err := ReadBytes(buf1.Bytes(), nil, nil, 0)
|
||||
ast2, err := ParseBytes(buf1.Bytes(), nil, nil, 0)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
|
@ -157,8 +157,28 @@ func verifyPrint(filename string, ast1 *File) {
|
|||
}
|
||||
|
||||
func TestIssue17697(t *testing.T) {
|
||||
_, err := ReadBytes(nil, nil, nil, 0) // return with parser error, don't panic
|
||||
_, err := ParseBytes(nil, nil, nil, 0) // return with parser error, don't panic
|
||||
if err == nil {
|
||||
t.Errorf("no error reported")
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseFile(t *testing.T) {
|
||||
_, err := ParseFile("", nil, nil, 0)
|
||||
if err == nil {
|
||||
t.Error("missing io error")
|
||||
}
|
||||
|
||||
var first error
|
||||
_, err = ParseFile("", func(err error) {
|
||||
if first == nil {
|
||||
first = err
|
||||
}
|
||||
}, nil, 0)
|
||||
if err == nil || first == nil {
|
||||
t.Error("missing io error")
|
||||
}
|
||||
if err != first {
|
||||
t.Error("got %v; want first error %v", err, first)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue