go/ssa: change import path of synthetic test package to "test$main"
...to avoid namespace conflicts.
Also make its name "main", since it defines func main().
And fix 2 typos.
Change-Id: I7cf7894d6bed134907b3d2742255e5a82426071b
Reviewed-on: https://go-review.googlesource.com/3150
Reviewed-by: Robert Griesemer <gri@golang.org>
diff --git a/cmd/callgraph/main_test.go b/cmd/callgraph/main_test.go
index 93ccb61..81fa490 100644
--- a/cmd/callgraph/main_test.go
+++ b/cmd/callgraph/main_test.go
@@ -40,13 +40,13 @@
// tests: main is not called.
{"rta", format, true, []string{
`pkg.Example --> (pkg.C).f`,
- `testmain.init --> pkg.init`,
+ `test$main.init --> pkg.init`,
}},
{"pta", format, true, []string{
`<root> --> pkg.Example`,
- `<root> --> testmain.init`,
+ `<root> --> test$main.init`,
`pkg.Example --> (pkg.C).f`,
- `testmain.init --> pkg.init`,
+ `test$main.init --> pkg.init`,
}},
} {
stdout = new(bytes.Buffer)
diff --git a/go/ssa/func.go b/go/ssa/func.go
index 3f08d3e..621ec1d 100644
--- a/go/ssa/func.go
+++ b/go/ssa/func.go
@@ -426,7 +426,7 @@
// Definition must be in an enclosing function;
// plumb it through intervening closures.
if f.parent == nil {
- panic("no Value for type.Object " + obj.Name())
+ panic("no ssa.Value for " + obj.String())
}
outer := f.parent.lookup(obj, true) // escaping
v := &FreeVar{
diff --git a/go/ssa/testmain.go b/go/ssa/testmain.go
index ae9ec1c..a525c0b 100644
--- a/go/ssa/testmain.go
+++ b/go/ssa/testmain.go
@@ -100,7 +100,7 @@
Prog: prog,
Members: make(map[string]Member),
values: make(map[types.Object]Value),
- Object: types.NewPackage("testmain", "testmain"),
+ Object: types.NewPackage("test$main", "main"),
}
// Build package's init function.
diff --git a/refactor/importgraph/graph.go b/refactor/importgraph/graph.go
index 6f49fab..df73e23 100644
--- a/refactor/importgraph/graph.go
+++ b/refactor/importgraph/graph.go
@@ -51,7 +51,7 @@
return seen
}
-// Builds scans the specified Go workspace and builds the forward and
+// Build scans the specified Go workspace and builds the forward and
// reverse import dependency graphs for all its packages.
// It also returns a mapping from import paths to errors for packages
// that could not be loaded.
