code review 2083042: Fix incorrect reporting of error in Scanner.next() when...

Fix incorrect reporting of error in Scanner.next() when Read reads > 0 bytes but returns os.EOF.

[Kyle C, 2010-08-31 23:25:51]

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[gri1, 2010-09-01 22:14:50]

LGTM
thanks,
- gri

On Tue, Aug 31, 2010 at 4:25 PM, <consalus@gmail.com> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> Fix incorrect reporting of error in Scanner.next() when Read reads > 0
> bytes but returns os.EOF.
>
> Please review this at http://codereview.appspot.com/2083042/
>
> Affected files:
>  M src/pkg/scanner/scanner.go
>
>
> Index: src/pkg/scanner/scanner.go
> ===================================================================
> --- a/src/pkg/scanner/scanner.go
> +++ b/src/pkg/scanner/scanner.go
> @@ -236,8 +236,10 @@
>                                if s.srcEnd == 0 {
>                                        return EOF
>                                }
> -                               s.error(err.String())
> -                               break
> +                               if err != os.EOF {
> +                                       s.error(err.String())
> +                                       break
> +                               }
>                        }
>                }
>                // at least one byte
>
>
>

[gri, 2010-09-01 22:15:39]

*** Submitted as http://code.google.com/p/go/source/detail?r=d558ddfffe1d ***

Fix incorrect reporting of error in Scanner.next() when Read reads > 0 bytes but
returns os.EOF.

R=golang-dev, gri1, gri
CC=golang-dev
http://codereview.appspot.com/2083042

Committer: Robert Griesemer <gri@golang.org>