attackgithub
diff --git a/‎ReClass.NET/CodeGenerator/CppCodeGenerator.cs‎
Lines changed: 12 additions & 11 deletions b/‎ReClass.NET/CodeGenerator/CppCodeGenerator.cs‎
Lines changed: 12 additions & 11 deletions
diff --git a/‎ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs‎
Lines changed: 7 additions & 7 deletions b/‎ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎ReClass.NET/Nodes/BaseReferenceNode.cs‎
Lines changed: 0 additions & 33 deletions b/‎ReClass.NET/Nodes/BaseReferenceNode.cs‎
Lines changed: 0 additions & 33 deletions
diff --git a/‎ReClass.NET/ReClass.NET.csproj‎
Lines changed: 0 additions & 1 deletion b/‎ReClass.NET/ReClass.NET.csproj‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎TODO.txt‎
Lines changed: 0 additions & 1 deletion b/‎TODO.txt‎
Lines changed: 0 additions & 1 deletion
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -124,7 +124,9 @@ private static IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode>
 
 			var alreadySeen = new HashSet<ClassNode>();
 
-			return classes.SelectMany(c => YieldReversedHierarchy(c, alreadySeen)).Distinct();
+			return classes
+				.SelectMany(c => YieldReversedHierarchy(c, alreadySeen))
+				.Distinct();
 		}
 
 		private static IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, ISet<ClassNode> alreadySeen)
@@ -136,18 +138,17 @@ private static IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, ISe
 
 			if (!alreadySeen.Add(node))
 			{
-				yield break;
+				return Enumerable.Empty<ClassNode>();
 			}
 
-			foreach (var referenceNode in node.Nodes.OfType<BaseReferenceNode>())
-			{
-				foreach (var referencedNode in YieldReversedHierarchy(referenceNode.InnerNode, alreadySeen))
-				{
-					yield return referencedNode;
-				}
-			}
+			var classNodes = node.Nodes
+				.OfType<BaseWrapperNode>()
+				.Select(w => w.ResolveMostInnerNode() as ClassNode)
+				.Where(n => n != null);
 
-			yield return node;
+			return classNodes
+				.SelectMany(c => YieldReversedHierarchy(c, alreadySeen))
+				.Append(node);
 		}
 
 		private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNode> members, ILogger logger)
 
@@ -165,18 +165,18 @@ public static void WriteNodes(Stream output, IEnumerable<BaseNode> nodes, ILogge
 
 			using (var project = new ReClassNetProject())
 			{
-				void RecursiveAddReferences(BaseReferenceNode referenceNode)
+				void RecursiveAddClasses(BaseWrapperNode wrapperNode)
 				{
-					if (project.ContainsClass(referenceNode.InnerNode.Uuid))
+					if (!(wrapperNode.ResolveMostInnerNode() is ClassNode classNode) || project.ContainsClass(classNode.Uuid))
 					{
 						return;
 					}
 
-					project.AddClass(referenceNode.InnerNode);
+					project.AddClass(classNode);
 
-					foreach (var reference in referenceNode.InnerNode.Nodes.OfType<BaseReferenceNode>())
+					foreach (var wrapperNodeChild in classNode.Nodes.OfType<BaseWrapperNode>())
 					{
-						RecursiveAddReferences(reference);
+						RecursiveAddClasses(wrapperNodeChild);
 					}
 				}
 
@@ -196,9 +196,9 @@ void RecursiveAddReferences(BaseReferenceNode referenceNode)
 						continue;
 					}
 
-					if (node is BaseReferenceNode referenceNode)
+					if (node is BaseWrapperNode wrapperNode)
 					{
-						RecursiveAddReferences(referenceNode);
+						RecursiveAddClasses(wrapperNode);
 					}
 
 					serialisationClass.AddNode(node);
 
@@ -407,7 +407,6 @@
     <Compile Include="Nodes\BaseHexCommentNode.cs" />
     <Compile Include="Nodes\BaseHexNode.cs" />
     <Compile Include="Nodes\BaseNode.cs" />
-    <Compile Include="Nodes\BaseReferenceNode.cs" />
     <Compile Include="Nodes\BaseTextNode.cs" />
     <Compile Include="Nodes\BaseTextPtrNode.cs" />
     <Compile Include="Nodes\BaseMatrixNode.cs" />
 
@@ -1,5 +1,4 @@
 1 BaseWrapperNode CodeGenerator
-2 Remove BaseReferenceNode
 3 NodeTypesBuilder Plugin support
 5 Custom data exchange needs access to the build in node handling for wrapped nodes
 6 Should BaseContainerNode be rebuild?
Original file line number	Diff line number	Diff line change
`@@ -165,18 +165,18 @@ public static void WriteNodes(Stream output, IEnumerable<BaseNode> nodes, ILogge`
`165`	`165`
`166`	`166`	`using (var project = new ReClassNetProject())`
`167`	`167`	`{`
`168`		`- void RecursiveAddReferences(BaseReferenceNode referenceNode)`
	`168`	`+ void RecursiveAddClasses(BaseWrapperNode wrapperNode)`
`169`	`169`	`{`
`170`		`- if (project.ContainsClass(referenceNode.InnerNode.Uuid))`
	`170`	`+ if (!(wrapperNode.ResolveMostInnerNode() is ClassNode classNode) \|\| project.ContainsClass(classNode.Uuid))`
`171`	`171`	`{`
`172`	`172`	`return;`
`173`	`173`	`}`
`174`	`174`
`175`		`- project.AddClass(referenceNode.InnerNode);`
	`175`	`+ project.AddClass(classNode);`
`176`	`176`
`177`		`- foreach (var reference in referenceNode.InnerNode.Nodes.OfType<BaseReferenceNode>())`
	`177`	`+ foreach (var wrapperNodeChild in classNode.Nodes.OfType<BaseWrapperNode>())`
`178`	`178`	`{`
`179`		`- RecursiveAddReferences(reference);`
	`179`	`+ RecursiveAddClasses(wrapperNodeChild);`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`@@ -196,9 +196,9 @@ void RecursiveAddReferences(BaseReferenceNode referenceNode)`
`196`	`196`	`continue;`
`197`	`197`	`}`
`198`	`198`
`199`		`- if (node is BaseReferenceNode referenceNode)`
	`199`	`+ if (node is BaseWrapperNode wrapperNode)`
`200`	`200`	`{`
`201`		`- RecursiveAddReferences(referenceNode);`
	`201`	`+ RecursiveAddClasses(wrapperNode);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`serialisationClass.AddNode(node);`