Implement context based parsing

To keep track of field&assemblies order.

metaschema/parser/context_parsing.go

@@ -0,0 +1,50 @@
+package parser
+
+import (
+	"encoding/xml"
+)
+
+type parentElement interface {
+	RegisterChild(GoStructItem)
+}
+
+type contextParser []parentElement
+
+var context contextParser
+
+func (cp *contextParser) Push(p parentElement) {
+	*cp = append(*cp, p)
+}
+
+func (cp *contextParser) Pop() {
+	*cp = (*cp)[:len(*cp)-1]
+}
+
+func (cp *contextParser) RegisterChild(child GoStructItem) {
+	(*cp)[len(*cp)-1].RegisterChild(child)
+}
+
+func (m *Model) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	type model Model
+	context.Push(m)
+	defer context.Pop()
+	return d.DecodeElement((*model)(m), &start)
+}
+
+func (m *Model) RegisterChild(child GoStructItem) {
+	m.sortedChilds = append(m.sortedChilds, child)
+}
+
+func (a *Assembly) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	type assembly Assembly
+	err := d.DecodeElement((*assembly)(a), &start)
+	context.RegisterChild(a)
+	return err
+}
+
+func (f *Field) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+	type field Field
+	err := d.DecodeElement((*field)(f), &start)
+	context.RegisterChild(f)
+	return err
+}

metaschema/parser/main.go

@@ -89,21 +89,15 @@ func (Metaschema *Metaschema) ContainsRootElement() bool {
 }
 
 type Model struct {
-	Assembly []Assembly `xml:"assembly"`
-	Field    []Field    `xml:"field"`
-	Choice   []Choice   `xml:"choice"`
-	Prose    *struct{}  `xml:"prose"`
+	Assembly     []Assembly `xml:"assembly"`
+	Field        []Field    `xml:"field"`
+	Choice       []Choice   `xml:"choice"`
+	Prose        *struct{}  `xml:"prose"`
+	sortedChilds []GoStructItem
 }
 
 func (m *Model) GoStructItems() []GoStructItem {
-	res := make([]GoStructItem, len(m.Assembly)+len(m.Field))
-	for i, _ := range m.Field {
-		res[i] = &m.Field[i]
-	}
-	for i, _ := range m.Assembly {
-		res[i+len(m.Field)] = &m.Assembly[i]
-	}
-	return res
+	return m.sortedChilds
 }
 
 type Choice struct {

metaschema/parser/metaschema_compile.go

@@ -24,6 +24,15 @@ func (metaschema *Metaschema) registerDependency(name string, dependency GoType)
 	}
 }
 
+func (metaschema *Metaschema) linkItems(list []GoStructItem) error {
+	for i, _ := range list {
+		err := list[i].compile(metaschema)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
 func (metaschema *Metaschema) linkAssemblies(list []Assembly) error {
 	for i, _ := range list {
 		a := &list[i]
@@ -63,20 +72,15 @@ func (metaschema *Metaschema) linkDefinitions() error {
 		if err = metaschema.linkFlags(da.Flags); err != nil {
 			return err
 		}
+		if err = metaschema.linkItems(da.Model.sortedChilds); err != nil {
+			return err
+		}
 		if err = metaschema.linkAssemblies(da.Model.Assembly); err != nil {
 			return err
 		}
 		if err = metaschema.linkFields(da.Model.Field); err != nil {
 			return err
 		}
-		for _, c := range da.Model.Choice {
-			if err = metaschema.linkAssemblies(c.Assembly); err != nil {
-				return err
-			}
-			if err = metaschema.linkFields(c.Field); err != nil {
-				return err
-			}
-		}
 	}
 
 	for _, df := range metaschema.DefineField {

metaschema/templates/generated_models.tmpl

@@ -20,19 +20,6 @@ type {{.GoTypeName}} struct {
       // {{ .GoComment }}
       {{.GoName}} {{.GoMemLayout}}{{.GoTypeNameMultiplexed}} `xml:"{{.XmlAnnotation}}" json:"{{.JsonName}},omitempty"`
     {{- end}}
-
-  {{- range .Model.Choice}}
-  {{- range .Field}}
-  // {{ .GoComment }}
-  {{.GoName}} {{.GoMemLayout}}{{.GoTypeName}} `xml:"{{.XmlAnnotation}}" json:"{{.JsonName}},omitempty"`
-  {{- end}}
-
-  {{- range .Assembly}}
-  // {{ .GoComment }}
-  {{.GoName}} {{.GoMemLayout}}{{.GoTypeName}} `xml:"{{.XmlAnnotation}}" json:"{{.JsonName}},omitempty"`
-  {{- end}}
-
-  {{- end}}
   {{end}}
 
 }