and parser.go and scanner_test.go which have minor formatting issues) R=rsc http://go/go-review/1016042
