From f8a67d79d19776efd43dc36d597bb3cbfdb779f3 Mon Sep 17 00:00:00 2001
From: Kyle Consalus <consalus@gmail.com>
Date: Wed, 1 Sep 2010 15:15:37 -0700
Subject: [PATCH] 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
https://golang.org/cl/2083042
---
 src/pkg/scanner/scanner.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pkg/scanner/scanner.go b/src/pkg/scanner/scanner.go
index 0f864f8ff3..11aa9f43f3 100644
--- 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