summaryrefslogtreecommitdiff
path: root/src/pkg/go/ast
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2012-10-30 13:38:01 -0700
committerRobert Griesemer <gri@golang.org>2012-10-30 13:38:01 -0700
commit051b66c2c7148f69ade0f6211e36ef827ea0c2ff (patch)
tree5a689259a279c1eaad62a7b0da0fb7f4604e35c6 /src/pkg/go/ast
parent7e6f83734da825839dd3142c650d8ed902a4623c (diff)
downloadgo-051b66c2c7148f69ade0f6211e36ef827ea0c2ff.tar.gz
gofmt: apply gofmt -w src misc
Remove trailing whitespace in comments. No other changes. R=r CC=golang-dev http://codereview.appspot.com/6815053
Diffstat (limited to 'src/pkg/go/ast')
-rw-r--r--src/pkg/go/ast/commentmap.go4
-rw-r--r--src/pkg/go/ast/filter.go2
-rw-r--r--src/pkg/go/ast/resolve.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/go/ast/commentmap.go b/src/pkg/go/ast/commentmap.go
index 201c94856..252d460af 100644
--- a/src/pkg/go/ast/commentmap.go
+++ b/src/pkg/go/ast/commentmap.go
@@ -99,7 +99,7 @@ func (r *commentListReader) next() {
// A nodeStack keeps track of nested nodes.
// A node lower on the stack lexically contains the nodes higher on the stack.
-//
+//
type nodeStack []Node
// push pops all nodes that appear lexically before n
@@ -113,7 +113,7 @@ func (s *nodeStack) push(n Node) {
// pop pops all nodes that appear lexically before pos
// (i.e., whose lexical extent has ended before or at pos).
// It returns the last node popped.
-//
+//
func (s *nodeStack) pop(pos token.Pos) (top Node) {
i := len(*s)
for i > 0 && (*s)[i-1].End() <= pos {
diff --git a/src/pkg/go/ast/filter.go b/src/pkg/go/ast/filter.go
index 4a89b8909..4db5814cb 100644
--- a/src/pkg/go/ast/filter.go
+++ b/src/pkg/go/ast/filter.go
@@ -414,7 +414,7 @@ func MergePackageFiles(pkg *Package, mode MergeMode) *File {
if path := imp.Path.Value; !seen[path] {
// TODO: consider handling cases where:
// - 2 imports exist with the same import path but
- // have different local names (one should probably
+ // have different local names (one should probably
// keep both of them)
// - 2 imports exist but only one has a comment
// - 2 imports exist and they both have (possibly
diff --git a/src/pkg/go/ast/resolve.go b/src/pkg/go/ast/resolve.go
index 54b5d7325..0406bfc58 100644
--- a/src/pkg/go/ast/resolve.go
+++ b/src/pkg/go/ast/resolve.go
@@ -57,7 +57,7 @@ func resolve(scope *Scope, ident *Ident) bool {
// An Importer must determine the canonical import path and
// check the map to see if it is already present in the imports map.
// If so, the Importer can return the map entry. Otherwise, the
-// Importer should load the package data for the given path into
+// Importer should load the package data for the given path into
// a new *Object (pkg), record pkg in the imports map, and then
// return pkg.
type Importer func(imports map[string]*Object, path string) (pkg *Object, err error)