convert non-low-level non-google pkg code

to whole-package compilation.

R=r
OCL=33070
CL=33101

3 files changed, 12 insertions, 71 deletions

diff --git a/src/pkg/go/scanner/Makefile b/src/pkg/go/scanner/Makefile
index 7845fe5a7..5e3f38d00 100644
--- a/src/pkg/go/scanner/Makefile
+++ b/src/pkg/go/scanner/Makefile
@@ -2,68 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-
-# DO NOT EDIT.  Automatically generated by gobuild.
-# gobuild -m scanner.go errors.go >Makefile
-
-D=/go/
-
 include $(GOROOT)/src/Make.$(GOARCH)
-AR=gopack
-
-default: packages
-
-clean:
-	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
-
-test: packages
-	gotest
-
-coverage: packages
-	gotest
-	6cov -g $$(pwd) | grep -v '_test\.go:'
-
-%.$O: %.go
-	$(GC) -I_obj $*.go
-
-%.$O: %.c
-	$(CC) $*.c
-
-%.$O: %.s
-	$(AS) $*.s
-
-O1=\
-	errors.$O\
-
-O2=\
-	scanner.$O\
-
-
-phases: a1 a2
-_obj$D/scanner.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/scanner.a errors.$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/scanner.a scanner.$O
-	rm -f $(O2)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/scanner.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/scanner.a
 
-packages: _obj$D/scanner.a
+TARG=go/scanner
+GOFILES=\
+	errors.go\
+	scanner.go\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/scanner.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/scanner.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/go/scanner/scanner.go b/src/pkg/go/scanner/scanner.go
index 2d5e2a83f..9a040aa6c 100644
--- a/src/pkg/go/scanner/scanner.go
+++ b/src/pkg/go/scanner/scanner.go
@@ -11,7 +11,6 @@ package scanner
 import (
 	"bytes";
 	"go/token";
-	"go/scanner";
 	"strconv";
 	"unicode";
 	"utf8";
diff --git a/src/pkg/go/scanner/scanner_test.go b/src/pkg/go/scanner/scanner_test.go
index 0cb200b48..2b3c94629 100644
--- a/src/pkg/go/scanner/scanner_test.go
+++ b/src/pkg/go/scanner/scanner_test.go
@@ -5,7 +5,6 @@
 package scanner
 
 import (
-	"go/scanner";
 	"go/token";
 	"os";
 	"strings";
@@ -207,7 +206,7 @@ func TestScan(t *testing.T) {
 	// verify scan
 	index := 0;
 	epos := token.Position{"", 0, 1, 1};
-	nerrors := scanner.Tokenize("", strings.Bytes(src), &TestErrorHandler{t}, scanner.ScanComments,
+	nerrors := Tokenize("", strings.Bytes(src), &TestErrorHandler{t}, ScanComments,
 		func (pos token.Position, tok token.Token, litb []byte) bool {
 			e := elt{token.EOF, "", special};
 			if index < len(tokens) {
@@ -280,7 +279,7 @@ func TestLineComments(t *testing.T) {
 	}
 
 	// verify scan
-	var S scanner.Scanner;
+	var S Scanner;
 	S.Init("TestLineComments", strings.Bytes(src), nil, 0);
 	for _, s := range segments {
 		pos, tok, lit := S.Scan();
@@ -295,7 +294,7 @@ func TestLineComments(t *testing.T) {
 
 // Verify that initializing the same scanner more then once works correctly.
 func TestInit(t *testing.T) {
-	var s scanner.Scanner;
+	var s Scanner;
 
 	// 1st init
 	s.Init("", strings.Bytes("if true { }"), nil, 0);
@@ -320,10 +319,10 @@ func TestInit(t *testing.T) {
 
 
 func TestIllegalChars(t *testing.T) {
-	var s scanner.Scanner;
+	var s Scanner;
 
 	const src = "*?*$*@*";
-	s.Init("", strings.Bytes(src), &TestErrorHandler{t}, scanner.AllowIllegalChars);
+	s.Init("", strings.Bytes(src), &TestErrorHandler{t}, AllowIllegalChars);
 	for offs, ch := range src {
 		pos, tok, lit := s.Scan();
 		if pos.Offset != offs {
@@ -352,9 +351,9 @@ func TestStdErrorHander(t *testing.T) {
 		"@ @ @"  // original file, line 1 again
 	;
 
-	var s scanner.Scanner;
+	var s Scanner;
 	v := NewErrorVector();
-	nerrors := scanner.Tokenize("File1", strings.Bytes(src), v, 0,
+	nerrors := Tokenize("File1", strings.Bytes(src), v, 0,
 		func (pos token.Position, tok token.Token, litb []byte) bool {
 			return tok != token.EOF;
 		}