diff options
Diffstat (limited to 'src/cmd/compile/internal/syntax/testing_test.go')
| -rw-r--r-- | src/cmd/compile/internal/syntax/testing_test.go | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/cmd/compile/internal/syntax/testing_test.go b/src/cmd/compile/internal/syntax/testing_test.go index d34e5eafaf..7e439c5523 100644 --- a/src/cmd/compile/internal/syntax/testing_test.go +++ b/src/cmd/compile/internal/syntax/testing_test.go @@ -6,22 +6,23 @@ package syntax import ( "fmt" + "regexp" "strings" "testing" ) -func TestErrorMap(t *testing.T) { - const src = `/* ERROR 0:0 */ /* ERROR "0:0" */ // ERROR 0:0 +func TestCommentMap(t *testing.T) { + const src = `/* ERROR "0:0" */ /* ERROR "0:0" */ // ERROR "0:0" // ERROR "0:0" -x /* ERROR 3:1 */ // ignore automatically inserted semicolon here -/* ERROR 3:1 */ // position of x on previous line - x /* ERROR 5:4 */ ; // do not ignore this semicolon -/* ERROR 5:22 */ // position of ; on previous line - package /* ERROR 7:2 */ // indented with tab - import /* ERROR 8:9 */ // indented with blanks +x /* ERROR "3:1" */ // ignore automatically inserted semicolon here +/* ERROR "3:1" */ // position of x on previous line + x /* ERROR "5:4" */ ; // do not ignore this semicolon +/* ERROR "5:24" */ // position of ; on previous line + package /* ERROR "7:2" */ // indented with tab + import /* ERROR "8:9" */ // indented with blanks ` - m := ErrorMap(strings.NewReader(src)) - got := 0 // number of errors found + m := CommentMap(strings.NewReader(src), regexp.MustCompile("^ ERROR ")) + found := 0 // number of errors found for line, errlist := range m { for _, err := range errlist { if err.Pos.Line() != line { @@ -29,17 +30,19 @@ x /* ERROR 3:1 */ // ignore automatically inserted semicolon here continue } // err.Pos.Line() == line - msg := fmt.Sprintf("%d:%d", line, err.Pos.Col()) - if err.Msg != msg { - t.Errorf("%v: got msg %q; want %q", err, err.Msg, msg) + + got := strings.TrimSpace(err.Msg[len(" ERROR "):]) + want := fmt.Sprintf(`"%d:%d"`, line, err.Pos.Col()) + if got != want { + t.Errorf("%v: got msg %q; want %q", err, got, want) continue } + found++ } - got += len(errlist) } - want := strings.Count(src, "ERROR") - if got != want { - t.Errorf("ErrorMap got %d errors; want %d", got, want) + want := strings.Count(src, " ERROR ") + if found != want { + t.Errorf("CommentMap got %d errors; want %d", found, want) } } |