From e2a9091da2ec00f1ce1cb4d6cd210327ff65c2aa Mon Sep 17 00:00:00 2001 From: David Crawshaw Date: Tue, 27 Oct 2015 17:23:37 -0400 Subject: [PATCH] bind: remove extra "package" from error string Fixes golang/go#13064 Change-Id: I2cde12a831607cd37d9760d92c0ef0f53fd6dd8b Reviewed-on: https://go-review.googlesource.com/16351 Reviewed-by: Hyang-Ah Hana Kim --- bind/gengo.go | 8 ++++---- bind/genjava.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bind/gengo.go b/bind/gengo.go index efc3767..0beccf6 100644 --- a/bind/gengo.go +++ b/bind/gengo.go @@ -103,7 +103,7 @@ func (g *goGen) genWrite(valName, seqName string, T types.Type) { case *types.Named: obj := T.Obj() if obj.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", T, g.pkg) + g.errorf("type %s not defined in %s", T, g.pkg) return } g.Printf("%s.WriteGoRef(%s)\n", seqName, valName) @@ -326,7 +326,7 @@ func (g *goGen) genRead(valName, seqName string, typ types.Type) { case *types.Named: o := u.Obj() if o.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", u, g.pkg) + g.errorf("type %s not defined in %s", u, g.pkg) return } g.Printf("// Must be a Go object\n") @@ -344,7 +344,7 @@ func (g *goGen) genRead(valName, seqName string, typ types.Type) { } o := t.Obj() if o.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", t, g.pkg) + g.errorf("type %s not defined in %s", t, g.pkg) return } g.Printf("var %s %s\n", valName, g.typeString(t)) @@ -374,7 +374,7 @@ func (g *goGen) typeString(typ types.Type) string { return types.TypeString(typ, types.RelativeTo(pkg)) } if obj.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", t, g.pkg) + g.errorf("type %s not defined in %s", t, g.pkg) } switch t.Underlying().(type) { diff --git a/bind/genjava.go b/bind/genjava.go index 632153a..a373854 100644 --- a/bind/genjava.go +++ b/bind/genjava.go @@ -551,7 +551,7 @@ func (g *javaGen) genRead(resName, seqName string, T types.Type) { case *types.Named: o := T.Obj() if o.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", T, g.pkg) + g.errorf("type %s not defined in %s", T, g.pkg) return } g.Printf("%s = new %s(%s.readRef());\n", resName, o.Name(), seqName) @@ -563,7 +563,7 @@ func (g *javaGen) genRead(resName, seqName string, T types.Type) { case *types.Interface, *types.Pointer: o := T.Obj() if o.Pkg() != g.pkg { - g.errorf("type %s not defined in package %s", T, g.pkg) + g.errorf("type %s not defined in %s", T, g.pkg) return } g.Printf("%s = new %s.Proxy(%s.readRef());\n", resName, o.Name(), seqName)