Merge branch 'master' of github.com:quickfixgo/quickfix into sqlstore

Author: mgatny

_gen/generate-components/main.go

@@ -53,24 +53,14 @@ func collectGroups(parent string, part datadictionary.MessagePart, groups []grou
 	return groups
 }
 
-func genGroupDeclaration(field *datadictionary.FieldDef, parent string) (fileOut string) {
-	fileOut += fmt.Sprintf("//%v is a repeating group in %v\n", field.Name(), parent)
-	fileOut += fmt.Sprintf("type %v struct {\n", field.Name())
-	fileOut += gen.WriteFieldDeclarations(fixSpec.Major, fixSpec.Minor, field.Parts, field.Name())
-
-	fileOut += "}\n"
-
-	return
-}
-
 func genGroupDeclarations(name string, fields []datadictionary.MessagePart) (fileOut string) {
 	groups := []group{}
 	for _, field := range fields {
 		groups = collectGroups(name, field, groups)
 	}
 
 	for _, group := range groups {
-		fileOut += genGroupDeclaration(group.field, group.parent)
+		fileOut += gen.WriteGroupDeclaration(fixSpec.Major, fixSpec.Minor, group.field, group.parent)
 	}
 
 	return

_gen/generate-messages/main.go

@@ -40,23 +40,6 @@ func genMessages() {
 	}
 }
 
-func genGroupDeclaration(field *datadictionary.FieldDef, parent string) (fileOut string) {
-	fileOut += fmt.Sprintf("//%v is a repeating group in %v\n", field.Name(), parent)
-	fileOut += fmt.Sprintf("type %v struct {\n", field.Name())
-	fileOut += gen.WriteFieldDeclarations(fixSpec.Major, fixSpec.Minor, field.Parts, field.Name())
-
-	fileOut += "}\n"
-
-	writer := new(bytes.Buffer)
-	if err := gen.WriteFieldSetters(writer, field.Name(), field.Parts); err != nil {
-		panic(err)
-	}
-	fileOut += writer.String()
-	fileOut += "\n"
-
-	return
-}
-
 type group struct {
 	parent string
 	field  *datadictionary.FieldDef
@@ -85,7 +68,7 @@ func genGroupDeclarations(msg *datadictionary.MessageDef) (fileOut string) {
 	}
 
 	for _, group := range groups {
-		fileOut += genGroupDeclaration(group.field, group.parent)
+		fileOut += gen.WriteGroupDeclaration(fixSpec.Major, fixSpec.Minor, group.field, group.parent)
 	}
 
 	return

_gen/helpers.go

@@ -1,6 +1,7 @@
 package gen
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"strconv"
@@ -163,6 +164,23 @@ func WriteFieldDeclarations(fixSpecMajor int, fixSpecMinor int, parts []datadict
 	return
 }
 
+func WriteGroupDeclaration(fixSpecMajor, fixSpecMinor int, field *datadictionary.FieldDef, parent string) (fileOut string) {
+	fileOut += fmt.Sprintf("//%v is a repeating group in %v\n", field.Name(), parent)
+	fileOut += fmt.Sprintf("type %v struct {\n", field.Name())
+	fileOut += WriteFieldDeclarations(fixSpecMajor, fixSpecMinor, field.Parts, field.Name())
+
+	fileOut += "}\n"
+
+	writer := new(bytes.Buffer)
+	if err := WriteFieldSetters(writer, field.Name(), field.Parts); err != nil {
+		panic(err)
+	}
+	fileOut += writer.String()
+	fileOut += "\n"
+
+	return
+}
+
 func writeFieldDeclaration(fixSpecMajor int, fixSpecMinor int, part datadictionary.MessagePart, componentName string) (s string) {
 	switch field := part.(type) {
 	case datadictionary.Component:

datadictionary/build.go

@@ -174,7 +174,6 @@ func (b builder) buildMessageDef(xmlMessage *XMLComponent) (*MessageDef, error)
 
 func (b builder) buildGroupFieldDef(xmlField *XMLComponentMember, groupFieldType *FieldType) (*FieldDef, error) {
 	var parts []MessagePart
-	var fields []*FieldDef
 
 	for _, member := range xmlField.Members {
 		if member.XMLName.Local == "component" {
@@ -190,19 +189,17 @@ func (b builder) buildGroupFieldDef(xmlField *XMLComponentMember, groupFieldType
 			}
 
 			parts = append(parts, comp)
-			fields = append(fields, comp.Fields()...)
 		} else {
 			var f *FieldDef
 			var err error
 			if f, err = b.buildFieldDef(member); err != nil {
 				return nil, err
 			}
 			parts = append(parts, f)
-			fields = append(fields, f)
 		}
 	}
 
-	return &FieldDef{FieldType: groupFieldType, required: (xmlField.Required == "Y"), Parts: parts, ChildFields: fields}, nil
+	return NewGroupFieldDef(groupFieldType, (xmlField.Required == "Y"), parts), nil
 }
 
 func (b builder) buildFieldDef(xmlField *XMLComponentMember) (*FieldDef, error) {
@@ -218,7 +215,7 @@ func (b builder) buildFieldDef(xmlField *XMLComponentMember) (*FieldDef, error)
 		return f, err
 	}
 
-	return &FieldDef{FieldType: fieldType, required: (xmlField.Required == "Y")}, nil
+	return NewFieldDef(fieldType, (xmlField.Required == "Y")), nil
 }
 
 func (b builder) buildFieldTypes() {

datadictionary/datadictionary.go

@@ -110,6 +110,37 @@ type FieldDef struct {
 	ChildFields []*FieldDef
 }
 
+//NewFieldDef returns an initialized FieldDef
+func NewFieldDef(fieldType *FieldType, required bool) *FieldDef {
+	return &FieldDef{
+		FieldType: fieldType,
+		required:  required,
+	}
+}
+
+//NewGroupFieldDef returns an initialized FieldDef for a repeating group
+func NewGroupFieldDef(fieldType *FieldType, required bool, parts []MessagePart) *FieldDef {
+	field := FieldDef{
+		FieldType: fieldType,
+		required:  required,
+		Parts:     parts,
+	}
+
+	for _, part := range parts {
+		if comp, ok := part.(Component); ok {
+			field.ChildFields = append(field.ChildFields, comp.Fields()...)
+		} else {
+			if child, ok := part.(*FieldDef); ok {
+				field.ChildFields = append(field.ChildFields, child)
+			} else {
+				panic("unknown part")
+			}
+		}
+	}
+
+	return &field
+}
+
 //Required returns true if this FieldDef is required for the containing
 //MessageDef
 func (f FieldDef) Required() bool { return f.required }

fix43/header.go

@@ -14,6 +14,10 @@ type NoHops struct {
 	HopRefID *int `fix:"630"`
 }
 
+func (m *NoHops) SetHopCompID(v string)         { m.HopCompID = &v }
+func (m *NoHops) SetHopSendingTime(v time.Time) { m.HopSendingTime = &v }
+func (m *NoHops) SetHopRefID(v int)             { m.HopRefID = &v }
+
 //Header is the fix43 Header type
 type Header struct {
 	//BeginString is a required field for Header.

fix43/instrument/Instrument.go

@@ -13,6 +13,9 @@ type NoSecurityAltID struct {
 	SecurityAltIDSource *string `fix:"456"`
 }
 
+func (m *NoSecurityAltID) SetSecurityAltID(v string)       { m.SecurityAltID = &v }
+func (m *NoSecurityAltID) SetSecurityAltIDSource(v string) { m.SecurityAltIDSource = &v }
+
 //Instrument is a fix43 Component
 type Instrument struct {
 	//Symbol is a non-required field for Instrument.

fix43/instrumentleg/InstrumentLeg.go

@@ -13,6 +13,9 @@ type NoLegSecurityAltID struct {
 	LegSecurityAltIDSource *string `fix:"606"`
 }
 
+func (m *NoLegSecurityAltID) SetLegSecurityAltID(v string)       { m.LegSecurityAltID = &v }
+func (m *NoLegSecurityAltID) SetLegSecurityAltIDSource(v string) { m.LegSecurityAltIDSource = &v }
+
 //InstrumentLeg is a fix43 Component
 type InstrumentLeg struct {
 	//LegSymbol is a non-required field for InstrumentLeg.

fix43/nestedparties/NestedParties.go

@@ -17,6 +17,11 @@ type NoNestedPartyIDs struct {
 	NestedPartySubID *string `fix:"545"`
 }
 
+func (m *NoNestedPartyIDs) SetNestedPartyID(v string)       { m.NestedPartyID = &v }
+func (m *NoNestedPartyIDs) SetNestedPartyIDSource(v string) { m.NestedPartyIDSource = &v }
+func (m *NoNestedPartyIDs) SetNestedPartyRole(v int)        { m.NestedPartyRole = &v }
+func (m *NoNestedPartyIDs) SetNestedPartySubID(v string)    { m.NestedPartySubID = &v }
+
 //NestedParties is a fix43 Component
 type NestedParties struct {
 	//NoNestedPartyIDs is a non-required field for NestedParties.

fix43/parties/Parties.go

@@ -17,6 +17,11 @@ type NoPartyIDs struct {
 	PartySubID *string `fix:"523"`
 }
 
+func (m *NoPartyIDs) SetPartyID(v string)       { m.PartyID = &v }
+func (m *NoPartyIDs) SetPartyIDSource(v string) { m.PartyIDSource = &v }
+func (m *NoPartyIDs) SetPartyRole(v int)        { m.PartyRole = &v }
+func (m *NoPartyIDs) SetPartySubID(v string)    { m.PartySubID = &v }
+
 //Parties is a fix43 Component
 type Parties struct {
 	//NoPartyIDs is a non-required field for Parties.