ensureSig

cl/pkginfo.go

@@ -63,13 +63,44 @@ func (p Package) InitDependencies() {
  real := t.Real
  uf, sig = real.Name(), real.Type().(*types.Signature)
  }
- f, _ := pkg.NewFuncWith(token.NoPos, uf, sig, nil)
+ f, _ := pkg.NewFuncWith(token.NoPos, uf, ensureSig(sig), nil)
  f.BodyStart(pkg).
  Val(vPanic).Val("notimpl").Call(1).EndStmt().
  End()
  }
 }
 
+const (
+ sigParamWithoutName = 1 << iota
+ sigParamWithName
+ sigParamInvalid = sigParamWithoutName | sigParamWithName
+)
+
+func ensureSig(sig *types.Signature) *types.Signature {
+ params := sig.Params()
+ kind := 0
+ for i, n := 0, params.Len(); i < n; i++ {
+ param := params.At(i)
+ if param.Name() != "" {
+ kind |= sigParamWithName
+ } else {
+ kind |= sigParamWithoutName
+ }
+ if kind == sigParamInvalid {
+ newParams := make([]*types.Var, n)
+ for i = 0; i < n; i++ {
+ param = params.At(i)
+ if param.Name() != "" {
+ param = types.NewParam(param.Pos(), param.Pkg(), "", param.Type())
+ }
+ newParams[i] = param
+ }
+ return types.NewSignature(nil, types.NewTuple(newParams...), sig.Results(), sig.Variadic())
+ }
+ }
+ return sig
+}
+
 func (p Package) WriteDepTo(dst io.Writer) error {
  p.InitDependencies()
  return gox.WriteTo(dst, p.Package, depsFile)

cl/pkginfo_test.go

@@ -2,12 +2,28 @@ package cl
 
 import (
  "bytes"
+ "go/types"
  "os"
  "testing"
 )
 
 // -----------------------------------------------------------------------------
 
+func TestEnsureSig(t *testing.T) {
+ a := types.NewParam(0, nil, "", types.Typ[types.Int])
+ b := types.NewParam(0, nil, "b", types.Typ[types.Bool])
+ params := types.NewTuple(a, b)
+ sig := types.NewSignature(nil, params, nil, false)
+ if tsig := ensureSig(sig); tsig == sig {
+ t.Fatal("ensureSig 1:", sig, tsig)
+ }
+ params = types.NewTuple(a)
+ sig = types.NewSignature(nil, params, nil, false)
+ if tsig := ensureSig(sig); tsig != sig {
+ t.Fatal("ensureSig 2:", sig, tsig)
+ }
+}
+
 func TestPkgInfo_Basic(t *testing.T) {
  pkg := testFunc(t, "Basic", `