diff options
| author | Robert Griesemer <gri@golang.org> | 2017-02-08 17:30:45 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2017-02-09 01:45:17 +0000 |
| commit | 9799622f09ba2ece6fa8eb7607d0d471d75d9915 (patch) | |
| tree | b7e4aaaf7e5ae59cb48ad6035aafa7bb708e97c8 /src/cmd/compile/internal/syntax/parser.go | |
| parent | 4f6d4bb3f4461e7e25eff24254115b689495e834 (diff) | |
| download | go-9799622f09ba2ece6fa8eb7607d0d471d75d9915.tar.xz | |
cmd/compile/internal/syntax: differentiate between ';' and '\n' in syntax errors
Towards better syntax error messages: With this change, the parser knows whether
a semicolon was an actual ';' in the source, or whether it was an automatically
inserted semicolon as result of a '\n' or EOF. Using this information in error
messages makes them more understandable.
For #17328.
Change-Id: I8cd9accee8681b62569d0ecef922d38682b401eb
Reviewed-on: https://go-review.googlesource.com/36636
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Diffstat (limited to 'src/cmd/compile/internal/syntax/parser.go')
| -rw-r--r-- | src/cmd/compile/internal/syntax/parser.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/syntax/parser.go b/src/cmd/compile/internal/syntax/parser.go index 3ebc670950..f016a6adbe 100644 --- a/src/cmd/compile/internal/syntax/parser.go +++ b/src/cmd/compile/internal/syntax/parser.go @@ -144,7 +144,7 @@ func (p *parser) syntax_error_at(pos src.Pos, msg string) { // determine token string var tok string switch p.tok { - case _Name: + case _Name, _Semi: tok = p.lit case _Literal: tok = "literal " + p.lit @@ -215,7 +215,7 @@ func tokstring(tok token) string { case _Comma: return "comma" case _Semi: - return "semicolon or newline" + return "semicolon" } return tok.String() } |