vgo: Loader initial commit

README.md

@@ -1,2 +1,19 @@
 ### `myitcv.io/...` mono-repo
 
+<!-- __TEMPLATE: go list -f "{{${DOLLAR}ip := .ImportPath}}{{range .Deps}}{{if (eq \"myitcv.io/vgo\" .)}}{{${DOLLAR}ip}}{{end}}{{end}}" ./...
+{{ with . }}
+Please note the following packages current rely on `vgo` with https://go-review.googlesource.com/c/vgo/+/105855 applied:
+
+```
+{{. -}}
+```
+{{end -}}
+-->
+
+Please note the following packages current rely on `vgo` with https://go-review.googlesource.com/c/vgo/+/105855 applied:
+
+```
+myitcv.io/immutable/cmd/immutableVet
+```
+<!-- END -->
+

_scripts/run_tests.sh

@@ -10,8 +10,11 @@ if [ "${CI:-}" == "true" ]
 then
 	go get -u golang.org/x/vgo
 	pushd $(go list -f "{{.Dir}}" golang.org/x/vgo) > /dev/null
-	git checkout -qf $VGO_COMMIT
+
+	# git checkout -qf $VGO_COMMIT
+	git fetch -q https://go.googlesource.com/vgo refs/changes/55/105855/3 && git checkout -qf FETCH_HEAD
 	go install
+
 	popd > /dev/null
 
 	# so we can access Github without hitting rate limits
@@ -63,17 +66,33 @@ do
 	then
 		./_scripts/run_tests.sh
 	else
+		if [ -f ./_scripts/pre_run_tests.sh ]
+		then
+			./_scripts/pre_run_tests.sh
+		fi
+
 		$go generate ./...
 		$go test ./...
 
-		# we can remove this once we resolve https://github.com/golang/go/issues/24661
-		$go install ./...
+		if [ -f ./_scripts/post_run_tests.sh ]
+		then
+			./_scripts/post_run_tests.sh
+		fi
 	fi
 	popd > /dev/null
 	echo "----"
 	echo ""
 done
 
+# we use regular go to list here because of https://github.com/golang/go/issues/24749;
+# this is also the reason why we need to change to the directory to do the vgo install
+for i in $(go list -f "{{if eq .Name \"main\"}}{{.Dir}}{{end}}" ./...)
+do
+	pushd $i > /dev/null
+	$go install
+	popd > /dev/null
+done
+
 echo Checking markdown files are current
 # by this point we will have mdreplace installed. Hence check that
 # committed .md files are "fresh"

cmd/mdreplace/README.md

@@ -55,7 +55,7 @@ _To see this in action, look at the [source of the
 ### Usage
 
 ```
-{{.}}
+{{. -}}
 ```
 -->
 ### Usage
@@ -69,12 +69,13 @@ Usage:
 When called with no file arguments, mdreplace works with stdin
 
 Flags:
+  -debug
+    	whether to print debug information of not
   -strip
     	whether to strip special comments from the file
   -w	whether to write back to input files (cannot be used when reading from 
   stdin)
 
-
 ```
 <!-- END -->
 

cmd/mdreplace/mdreplace.go

@@ -50,6 +50,7 @@ import (
 var (
 	fWrite = flag.Bool("w", false, "whether to write back to input files (cannot be used when reading from stdin)")
 	fStrip = flag.Bool("strip", false, "whether to strip special comments from the file")
+	fDebug = flag.Bool("debug", false, "whether to print debug information of not")
 )
 
 //go:generate pkgconcat -out gen_cliflag.go myitcv.io/_tmpls/cliflag
@@ -150,7 +151,7 @@ func infof(format string, args ...interface{}) {
 }
 
 func debugf(format string, args ...interface{}) {
-	if debug {
+	if debug || *fDebug {
 		fmt.Fprintf(os.Stderr, format, args...)
 	}
 }

immutable/_scripts/run_tests.sh

@@ -10,20 +10,14 @@ rm -f !(_vendor)/**/gen_*.go
 $go install myitcv.io/immutable/cmd/immutableGen
 $go install myitcv.io/immutable/cmd/immutableVet
 
+# this step is needed because _testFiles is not walked by ./...
 pushd cmd/immutableVet/_testFiles
 $go generate
 popd
 
 $go generate ./...
-
-# for immutable this step needs to be before the tests (because some of the
-# tests rely on the myitcv.io/immutable package to have been installed)
-
-# we can remove this once we resolve https://github.com/golang/go/issues/24661
-$go install ./...
-
 $go test ./...
 
+$go install myitcv.io/immutable/cmd/immutableVet
 
 immutableVet myitcv.io/immutable/example
-

immutable/cmd/immutableVet/immutableVet.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"go/ast"
-	"go/importer"
 	"go/parser"
 	"go/printer"
 	"go/token"
@@ -22,13 +21,16 @@ import (
 	"myitcv.io/gogenerate"
 	"myitcv.io/immutable"
 	"myitcv.io/immutable/util"
+	"myitcv.io/vgo"
 )
 
 const (
 	skipFileComment = "//" + immutable.CmdImmutableVet + ":skipFile"
 )
 
-var fset = token.NewFileSet()
+var (
+	fset = token.NewFileSet()
+)
 
 type immutableVetter struct {
 	pkgs map[string]*ast.Package
@@ -51,6 +53,9 @@ type immutableVetter struct {
 	vcls map[*ast.CompositeLit]bool
 
 	errlist []immErr
+
+	importer types.ImporterFrom
+	immIntf  *types.Interface
 }
 
 var typesCache = map[string]bool{
@@ -64,8 +69,6 @@ type immErr struct {
 
 type errors []immErr
 
-var immIntf *types.Interface
-
 func main() {
 	flag.Parse()
 
@@ -87,9 +90,11 @@ func main() {
 	}
 }
 
-func loadImmIntf() {
+func loadImmIntf(dir string) (types.ImporterFrom, *types.Interface) {
 	ip := "myitcv.io/immutable"
 
+	importer := vgo.NewTestLoader(dir)
+
 	bpkg, err := build.Import(ip, "", 0)
 	if err != nil {
 		fatalf("failed to import %v: %v", ip, err)
@@ -115,7 +120,7 @@ func loadImmIntf() {
 
 	conf := types.Config{
 		FakeImportC: true,
-		Importer:    importer.For("gc", nil),
+		Importer:    importer,
 	}
 
 	tpkg, err := conf.Check(ip, fset, files, nil)
@@ -144,14 +149,12 @@ func loadImmIntf() {
 		fatalf("Underlying type is not a *types.Interface: %T", nmd.Underlying())
 	}
 
-	immIntf = intf
+	return importer, intf
 }
 
 func vet(wd string, specs []string) []immErr {
 	var emsgs []immErr
 
-	loadImmIntf()
-
 	// vetting phase: vet all packages packages passed in through the command line
 	for _, spec := range specs {
 
@@ -420,11 +423,15 @@ func newImmutableVetter(ipkg *build.Package, wd string) *immutableVetter {
 		fatalf("could not parse package directory for %v", ipkg.Name)
 	}
 
+	importer, immIntf := loadImmIntf(ipkg.Dir)
+
 	return &immutableVetter{
 		pkgs:      pkgs,
 		bpkg:      ipkg,
 		vcls:      make(map[*ast.CompositeLit]bool),
 		wd:        wd,
+		immIntf:   immIntf,
+		importer:  importer,
 		skipFiles: make(map[string]bool),
 	}
 }
@@ -451,7 +458,7 @@ func (iv *immutableVetter) vetPackages() []immErr {
 
 		// check types for the core package
 		conf := types.Config{
-			Importer: importer.Default(),
+			Importer: iv.importer,
 		}
 		info := &types.Info{
 			Selections: make(map[*ast.SelectorExpr]*types.Selection),
@@ -497,7 +504,7 @@ func (iv *immutableVetter) vetPackages() []immErr {
 
 					for i := 0; i < st.NumFields(); i++ {
 						f := st.Field(i)
-						if !isImmType(f.Type()) {
+						if !iv.isImmType(f.Type()) {
 							msg := fmt.Sprintf("immutable struct field must be immutable type; %v is not", f.Type())
 							iv.errorf(f.Pos(), msg)
 						}
@@ -575,7 +582,7 @@ func (iv *immutableVetter) vetPackages() []immErr {
 	return iv.errlist
 }
 
-func isImmType(t types.Type) bool {
+func (iv *immutableVetter) isImmType(t types.Type) bool {
 	if v, ok := typesCache[t.String()]; ok {
 		return v
 	}
@@ -585,7 +592,7 @@ func isImmType(t types.Type) bool {
 
 		typesCache[t.String()] = true
 
-		v := isImmType(t.Underlying())
+		v := iv.isImmType(t.Underlying())
 		typesCache[t.String()] = v
 
 		return v
@@ -598,14 +605,14 @@ func isImmType(t types.Type) bool {
 	case *types.Struct:
 		for i := 0; i < t.NumFields(); i++ {
 			f := t.Field(i)
-			if !isImmType(f.Type()) {
+			if !iv.isImmType(f.Type()) {
 				return false
 			}
 		}
 
 		return true
 	case *types.Interface:
-		return types.Implements(t, immIntf)
+		return types.Implements(t, iv.immIntf)
 	case *types.Signature:
 		return false
 	default:

immutable/go.mod

@@ -4,4 +4,9 @@ require (
 	"github.com/kisielk/gotool" v1.0.0
 	"golang.org/x/tools" v0.0.0-20180401165715-ac136b6c2db7
 	"myitcv.io/gogenerate" v0.0.0-20180405194116-cdcde380fd71d44b727692b77c152bb2e9df079c
+	"myitcv.io/vgo" v0.0.0
+)
+
+replace (
+	"myitcv.io/vgo" v0.0.0 => "../vgo"
 )

vgo/go.mod

@@ -0,0 +1,3 @@
+module "myitcv.io/vgo"
+
+require "golang.org/x/net" v0.0.0-20180406214816-61147c48b25b