Merge pull request #52 from gostaticanalysis/fix-packages-cmd

Fix main.go of packages kind tempalte
gostaticanalysis · Mar 25, 2022 · 191763a · 191763a
2 parents 79d190c + 9ccbead
commit 191763a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/v2/go.mod b/v2/go.mod
@@ -7,3 +7,5 @@ require (
 	github.com/tenntenn/golden v0.2.0
 	golang.org/x/mod v0.4.2
 )
+
+retract v2.1.1
diff --git a/v2/skeleton/_template/packages/@@.Pkg@@.go b/v2/skeleton/_template/packages/@@.Pkg@@.go
@@ -34,9 +34,13 @@ func run(pass *internal.Pass) error {
 		case *ast.Ident:
 			if n.Name == "gopher" {
 				pos := pass.Fset.Position(n.Pos())
-				fname, err := filepath.Rel(pass.Module.Dir, pos.Filename)
-				if err != nil {
-					return
+				fname := pos.Filename
+				if pass.Module != nil {
+					var err error
+					fname, err = filepath.Rel(pass.Module.Dir, fname)
+					if err != nil {
+						return
+					}
 				}
 				fmt.Fprintf(pass.Stdout, "%s:%d:%d identifier is gopher\n", fname, pos.Line, pos.Column)
 			}

diff --git a/v2/skeleton/_template/packages/cmd/@@.Pkg@@/main.go b/v2/skeleton/_template/packages/cmd/@@.Pkg@@/main.go
@@ -33,12 +33,12 @@ func run() error {
 	}
 
 	for _, pkg := range pkgs {
-		prog, srcFuncs, err := internal.Buildssa(pkg, @@.Pkg@@.Analyzer.SSABuilderMode)
+		prog, srcFuncs, err := internal.BuildSSA(pkg, @@.Pkg@@.Analyzer.SSABuilderMode)
 		if err != nil {
 			return err
 		}
 
-		pass := &@@.Pkg@@.Pass{
+		pass := &internal.Pass{
 			Package:  pkg,
 			SSA:      prog,
 			SrcFuncs: srcFuncs,

diff --git a/v2/skeleton/testdata/kind-packages.golden b/v2/skeleton/testdata/kind-packages.golden
@@ -33,12 +33,12 @@ func run() error {
 	}
 
 	for _, pkg := range pkgs {
-		prog, srcFuncs, err := internal.Buildssa(pkg, example.Analyzer.SSABuilderMode)
+		prog, srcFuncs, err := internal.BuildSSA(pkg, example.Analyzer.SSABuilderMode)
 		if err != nil {
 			return err
 		}
 
-		pass := &example.Pass{
+		pass := &internal.Pass{
 			Package:  pkg,
 			SSA:      prog,
 			SrcFuncs: srcFuncs,
@@ -91,9 +91,13 @@ func run(pass *internal.Pass) error {
 		case *ast.Ident:
 			if n.Name == "gopher" {
 				pos := pass.Fset.Position(n.Pos())
-				fname, err := filepath.Rel(pass.Module.Dir, pos.Filename)
-				if err != nil {
-					return
+				fname := pos.Filename
+				if pass.Module != nil {
+					var err error
+					fname, err = filepath.Rel(pass.Module.Dir, fname)
+					if err != nil {
+						return
+					}
 				}
 				fmt.Fprintf(pass.Stdout, "%s:%d:%d identifier is gopher\n", fname, pos.Line, pos.Column)
 			}

diff --git a/v2/version.txt b/v2/version.txt
@@ -1 +1 @@
-v2.1.1
+v2.1.2