Skip to content

Commit

Permalink
fieldGenerator: add top-level Generate method
Browse files Browse the repository at this point in the history
This just calls all other generate methods for the fieldGenerator
  • Loading branch information
abhinav committed Mar 30, 2016
1 parent af71e9e commit 4d379d8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
20 changes: 20 additions & 0 deletions gen/field.go
Expand Up @@ -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 {
Expand Down
14 changes: 1 addition & 13 deletions gen/struct.go
Expand Up @@ -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)
}

Expand Down

0 comments on commit 4d379d8

Please sign in to comment.