fix build (this time for real): adjust typechecker test, ogle

R=r, r2
CC=golang-dev
https://golang.org/cl/4006041

src/pkg/exp/ogle/cmd.go

@@ -64,7 +64,8 @@ func Main() {
 func newScanner(input []byte) (*scanner.Scanner, *scanner.ErrorVector) {
 	sc := new(scanner.Scanner)
 	ev := new(scanner.ErrorVector)
-	sc.Init(fset, "input", input, ev, 0)
+	file := fset.AddFile("input", fset.Base(), len(input))
+	sc.Init(file, input, ev, 0)
 	return sc, ev
 }
 

src/pkg/go/typechecker/typechecker_test.go

@@ -68,7 +68,8 @@ func expectedErrors(t *testing.T, pkg *ast.Package) (list scanner.ErrorList) {
 		}
 
 		var s scanner.Scanner
-		s.Init(fset, filename, src, nil, scanner.ScanComments)
+		file := fset.AddFile(filename, fset.Base(), len(src))
+		s.Init(file, src, nil, scanner.ScanComments)
 		var prev token.Pos // position of last non-comment token
 	loop:
 		for {