From: Robert Griesemer <gri@golang.org>
Date: Thu, 27 Jan 2011 06:09:14 +0000 (-0800)
Subject: go/scanner: fix build (adjust scanner EOF linecount)
X-Git-Tag: weekly.2011-02-01~63
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1e17621cbe84a0dde3892e04ab2a746ff3d78c31;p=gostls13.git

go/scanner: fix build (adjust scanner EOF linecount)

R=adg
CC=golang-dev
https://golang.org/cl/3990045
---

diff --git a/src/pkg/go/scanner/scanner_test.go b/src/pkg/go/scanner/scanner_test.go
index 1c3b6728c2..c622ff482f 100644
--- a/src/pkg/go/scanner/scanner_test.go
+++ b/src/pkg/go/scanner/scanner_test.go
@@ -223,7 +223,7 @@ func TestScan(t *testing.T) {
 	for _, e := range tokens {
 		src += e.lit + whitespace
 	}
-	src_linecount := newlineCount(src) + 1
+	src_linecount := newlineCount(src)
 	whitespace_linecount := newlineCount(whitespace)
 
 	// verify scan
@@ -241,7 +241,7 @@ func TestScan(t *testing.T) {
 		if tok == token.EOF {
 			lit = "<EOF>"
 			epos.Line = src_linecount
-			epos.Column = 1
+			epos.Column = 2
 		}
 		checkPos(t, lit, pos, epos)
 		if tok != e.tok {