refactor support for recursive schema to address issues

meta/builder.go

@@ -217,7 +217,7 @@ func (b *Builder) Units(o interface{}, units string) {
 
 func (b *Builder) AddExtension(o interface{}, keyword string, ext *Extension) {
 	ext.keyword = keyword
-	m, valid := o.(HasExtensions)
+	m, valid := o.(hasAddExtension)
 	if !valid {
 		b.setErr(fmt.Errorf("%T does not support extensions", o))
 	} else {

meta/compile.go

@@ -13,6 +13,7 @@ import (
 func Compile(root *Module) error {
 	c := &compiler{
 		root: root,
+		pool: make(map[HasDefinitions]struct{}),
 	}
 	// loads submodules, imports and then resolve uses with groupings
 	if err := resolve(root); err != nil {
@@ -23,6 +24,7 @@ func Compile(root *Module) error {
 
 type compiler struct {
 	root *Module
+	pool map[HasDefinitions]struct{}
 }
 
 func (c *compiler) module(y *Module) error {
@@ -130,7 +132,8 @@ func (c *compiler) compile(o interface{}) error {
 	}
 
 	if x, ok := o.(HasDataDefinitions); ok {
-		if !x.IsRecursive() {
+		if _, alreadyCompiled := c.pool[x]; !alreadyCompiled {
+			c.pool[x] = struct{}{}
 			for _, y := range x.DataDefinitions() {
 				if err := c.compile(y); err != nil {
 					return err

meta/core.go

@@ -66,6 +66,10 @@ func (y *Module) getOriginalParent() Definition {
 	return nil
 }
 
+func (y *Module) setParent(p Meta) {
+	y.parent = p.(*Module)
+}
+
 func (y *Module) RevisionHistory() []*Revision {
 	return y.rev
 }
@@ -194,6 +198,7 @@ type Choice struct {
 }
 
 func (y *Choice) addCase(c *ChoiceCase) error {
+	c.setParent(y)
 	if _, exists := y.cases[c.Ident()]; exists {
 		return fmt.Errorf("conflict adding add %s to %s. ", c.Ident(), y.Ident())
 	}
@@ -215,6 +220,10 @@ func (y *Choice) CaseIdents() []string {
 	return idents
 }
 
+func (y *Choice) setParent(p Meta) {
+	y.parent = p
+}
+
 type ChoiceCase struct {
 	ident          string
 	desc           string
@@ -228,7 +237,10 @@ type ChoiceCase struct {
 	dataDefsIndex  map[string]Definition
 	ifs            []*IfFeature
 	extensions     []*Extension
-	recursive      bool
+}
+
+func (y *ChoiceCase) setParent(p Meta) {
+	y.parent = p
 }
 
 // Revision is like a version for a module.  Format is YYYY-MM-DD and should match
@@ -261,7 +273,10 @@ type Container struct {
 	ifs            []*IfFeature
 	musts          []*Must
 	extensions     []*Extension
-	recursive      bool
+}
+
+func (y *Container) setParent(p Meta) {
+	y.parent = p
 }
 
 type OrderedBy int
@@ -297,7 +312,10 @@ type List struct {
 	musts          []*Must
 	extensions     []*Extension
 	unique         [][]string
-	recursive      bool
+}
+
+func (y *List) setParent(p Meta) {
+	y.parent = p
 }
 
 func (y *List) KeyMeta() (keyMeta []Leafable) {
@@ -322,6 +340,10 @@ type Leaf struct {
 	extensions     []*Extension
 }
 
+func (y *Leaf) setParent(p Meta) {
+	y.parent = p
+}
+
 type LeafList struct {
 	ident          string
 	parent         Meta
@@ -344,6 +366,10 @@ type LeafList struct {
 	extensions     []*Extension
 }
 
+func (y *LeafList) setParent(p Meta) {
+	y.parent = p
+}
+
 var anyType = newType("any")
 
 type Any struct {
@@ -361,6 +387,10 @@ type Any struct {
 	extensions     []*Extension
 }
 
+func (y *Any) setParent(p Meta) {
+	y.parent = p
+}
+
 func (y *Any) HasDefault() bool {
 	return false
 }
@@ -430,6 +460,10 @@ type Grouping struct {
 	extensions []*Extension
 }
 
+func (y *Grouping) setParent(p Meta) {
+	y.parent = p
+}
+
 type Uses struct {
 	ident          string
 	desc           string
@@ -444,6 +478,10 @@ type Uses struct {
 	extensions     []*Extension
 }
 
+func (y *Uses) setParent(p Meta) {
+	y.parent = p
+}
+
 func (y *Uses) Refinements() []*Refine {
 	return y.refines
 }
@@ -465,6 +503,10 @@ type Refine struct {
 	extensions     []*Extension
 }
 
+func (y *Refine) setParent(p Meta) {
+	y.parent = p.(*Uses)
+}
+
 func (y *Refine) splitIdent() (string, string) {
 	slash := strings.IndexRune(y.ident, '/')
 	if slash < 0 {
@@ -487,6 +529,10 @@ type RpcInput struct {
 	extensions     []*Extension
 }
 
+func (y *RpcInput) setParent(p Meta) {
+	y.parent = p
+}
+
 func (y *RpcInput) Ident() string {
 	return "input"
 }
@@ -505,6 +551,10 @@ type RpcOutput struct {
 	extensions     []*Extension
 }
 
+func (y *RpcOutput) setParent(p Meta) {
+	y.parent = p
+}
+
 func (y *RpcOutput) Ident() string {
 	return "output"
 }
@@ -524,6 +574,10 @@ type Rpc struct {
 	extensions     []*Extension
 }
 
+func (y *Rpc) setParent(p Meta) {
+	y.parent = p
+}
+
 func (y *Rpc) Input() *RpcInput {
 	return y.input
 }
@@ -547,6 +601,10 @@ type Notification struct {
 	extensions     []*Extension
 }
 
+func (y *Notification) setParent(p Meta) {
+	y.parent = p
+}
+
 type Typedef struct {
 	ident          string
 	parent         Meta
@@ -559,6 +617,10 @@ type Typedef struct {
 	extensions     []*Extension
 }
 
+func (y *Typedef) setParent(p Meta) {
+	y.parent = p
+}
+
 type Augment struct {
 	ident          string
 	parent         Meta
@@ -574,6 +636,10 @@ type Augment struct {
 	extensions     []*Extension
 }
 
+func (y *Augment) setParent(p Meta) {
+	y.parent = p
+}
+
 func (a *Augment) addCase(c *ChoiceCase) error {
 	return a.addDataDefinition(c)
 }
@@ -637,6 +703,10 @@ type Deviation struct {
 	extensions []*Extension
 }
 
+func (y *Deviation) setParent(p Meta) {
+	y.parent = p
+}
+
 type Type struct {
 	ident           string
 	desc            string