From 4d379d81c6fd5c15378b02ae20d76436f2f9e9c9 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Mon, 28 Mar 2016 15:46:38 -0700 Subject: [PATCH] fieldGenerator: add top-level Generate method This just calls all other generate methods for the fieldGenerator --- gen/field.go | 20 ++++++++++++++++++++ gen/struct.go | 14 +------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/gen/field.go b/gen/field.go index 0f292e0e..b2cce6c8 100644 --- a/gen/field.go +++ b/gen/field.go @@ -28,6 +28,26 @@ type fieldGroupGenerator struct { Fields compile.FieldGroup } +func (f fieldGroupGenerator) Generate(g Generator) error { + if err := f.DefineStruct(g); err != nil { + return err + } + + if err := f.ToWire(g); err != nil { + return err + } + + if err := f.FromWire(g); err != nil { + return err + } + + if err := f.String(g); err != nil { + return err + } + + return nil +} + func (f fieldGroupGenerator) DefineStruct(g Generator) error { return g.DeclareFromTemplate( `type <.Name> struct { diff --git a/gen/struct.go b/gen/struct.go index 2dbb5092..7103924b 100644 --- a/gen/struct.go +++ b/gen/struct.go @@ -63,19 +63,7 @@ func structure(g Generator, spec *compile.StructSpec) error { Fields: spec.Fields, } - if err := fg.DefineStruct(g); err != nil { - return wrapGenerateError(spec.ThriftName(), err) - } - - if err := fg.ToWire(g); err != nil { - return wrapGenerateError(spec.ThriftName(), err) - } - - if err := fg.FromWire(g); err != nil { - return wrapGenerateError(spec.ThriftName(), err) - } - - if err := fg.String(g); err != nil { + if err := fg.Generate(g); err != nil { return wrapGenerateError(spec.ThriftName(), err) }