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

R=golang-dev, gri1, gri
CC=golang-dev
https://golang.org/cl/2083042

diff --git a/src/pkg/scanner/scanner.go b/src/pkg/scanner/scanner.go
index 0f864f8ff340c6d792b8b9b42df1add963289f86..11aa9f43f33d44bb573dd1177fa96f5ce97c8517 100644 (file)
--- a/src/pkg/scanner/scanner.go
+++ b/src/pkg/scanner/scanner.go
@@ -236,8 +236,10 @@ func (s *Scanner) next() int {
                                if s.srcEnd == 0 {
                                        return EOF
                                }
-                               s.error(err.String())
-                               break
+                               if err != os.EOF {
+                                       s.error(err.String())
+                                       break
+                               }
                        }
                }
                // at least one byte