switch root element when inlining (#172)

* switch root element when propogating inlines; add a test for recursive and mutually-recursive types
tinylib · Jan 1, 2017 · 362bfb3 · 362bfb3
1 parent 38a6f61
commit 362bfb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/_generated/def.go b/_generated/def.go
@@ -199,3 +199,13 @@ type FileHandle struct {
 
 type CustomInt int
 type CustomBytes []byte
+
+type Wrapper struct {
+	Tree *Tree
+}
+
+type Tree struct {
+	Children []Tree
+	Element  int
+	Parent   *Wrapper
+}
diff --git a/parse/inline.go b/parse/inline.go
@@ -119,10 +119,8 @@ func (f *FileSet) nextInline(ref *gen.Elem, root string) {
 					panic(fatalloop)
 				}
 
-				// inline bottom-up so as not to miss
-				// other inlining opportunities.
-				f.nextInline(&node, root)
 				*ref = node.Copy()
+				f.nextInline(ref, node.TypeName())
 			} else if !ok && !el.Resolved() {
 				// this is the point at which we're sure that
 				// we've got a type that isn't a primitive,