From ba3a48a31b3240b0b9f4c7086278993361809b31 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Wed, 29 Jul 2015 11:44:06 +0200 Subject: [PATCH] bind: leaner Var --- bind/vars.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bind/vars.go b/bind/vars.go index d73680f..a4a884e 100644 --- a/bind/vars.go +++ b/bind/vars.go @@ -15,7 +15,7 @@ type Var struct { id string doc string name string - obj types.Object + typ types.Type dtype typedesc } @@ -23,14 +23,14 @@ func (v *Var) Name() string { return v.name } -func newVar(p *Package, obj types.Object, name, doc string) *Var { +func newVar(p *Package, typ types.Type, objname, name, doc string) *Var { return &Var{ pkg: p, - id: p.Name() + "_" + obj.Name(), + id: p.Name() + "_" + objname, doc: doc, name: name, - obj: obj, - dtype: getTypedesc(obj.Type()), + typ: typ, + dtype: getTypedesc(typ), } } @@ -43,7 +43,7 @@ func newVarsFrom(p *Package, tuple *types.Tuple) []*Var { } func newVarFrom(p *Package, v *types.Var) *Var { - return newVar(p, v, v.Name(), p.getDoc("", v)) + return newVar(p, v.Type(), v.Name(), v.Name(), p.getDoc("", v)) } func getTypedesc(t types.Type) typedesc { @@ -75,7 +75,7 @@ func getTypedesc(t types.Type) typedesc { } func (v *Var) GoType() types.Type { - return v.obj.Type() + return v.typ } func (v *Var) CType() string {