Basic support for unchained wrappers.

KN4CK3R · KN4CK3R · commit 85a81ddedeba · 2019-01-18T14:04:32.000+01:00
diff --git a/ReClass.NET/CodeGenerator/CppCodeGenerator.cs b/ReClass.NET/CodeGenerator/CppCodeGenerator.cs
@@ -235,23 +235,19 @@ private MemberDefinition GetMemberDefinitionForNode(BaseNode member, ILogger log
 
 			if (member is ClassInstanceNode classInstanceNode)
 			{
-				return new MemberDefinition(classInstanceNode, classInstanceNode.InnerNode.Name);
+				return new MemberDefinition(classInstanceNode, $"class {classInstanceNode.InnerNode.Name}");
 			}
 
 			if (member is BaseWrapperNode wrapperNode)
 			{
 				// TODO Support WrapperNode chains
 				if (member is PointerNode)
 				{
-					var innerNode = wrapperNode.ResolveMostInnerNode();
-
-					return new MemberDefinition(member, innerNode == null ? "void*" : GetMemberDefinitionForNode(innerNode, logger).Type + "*");
+					return new MemberDefinition(member, wrapperNode.InnerNode == null ? "void*" : GetMemberDefinitionForNode(wrapperNode.InnerNode, logger).Type + "*");
 				}
 				if (member is ArrayNode arrayNode)
 				{
-					var innerNode = wrapperNode.ResolveMostInnerNode();
-
-					return new MemberDefinition(member, GetMemberDefinitionForNode(innerNode, logger).Type, arrayNode.Count);
+					return new MemberDefinition(member, GetMemberDefinitionForNode(wrapperNode.InnerNode, logger).Type, arrayNode.Count);
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -235,23 +235,19 @@ private MemberDefinition GetMemberDefinitionForNode(BaseNode member, ILogger log`
`235`	`235`
`236`	`236`	`if (member is ClassInstanceNode classInstanceNode)`
`237`	`237`	`{`
`238`		`- return new MemberDefinition(classInstanceNode, classInstanceNode.InnerNode.Name);`
	`238`	`+ return new MemberDefinition(classInstanceNode, $"class {classInstanceNode.InnerNode.Name}");`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`if (member is BaseWrapperNode wrapperNode)`
`242`	`242`	`{`
`243`	`243`	`// TODO Support WrapperNode chains`
`244`	`244`	`if (member is PointerNode)`
`245`	`245`	`{`
`246`		`- var innerNode = wrapperNode.ResolveMostInnerNode();`
`247`		`-`
`248`		`- return new MemberDefinition(member, innerNode == null ? "void" : GetMemberDefinitionForNode(innerNode, logger).Type + "");`
	`246`	`+ return new MemberDefinition(member, wrapperNode.InnerNode == null ? "void" : GetMemberDefinitionForNode(wrapperNode.InnerNode, logger).Type + "");`
`249`	`247`	`}`
`250`	`248`	`if (member is ArrayNode arrayNode)`
`251`	`249`	`{`
`252`		`- var innerNode = wrapperNode.ResolveMostInnerNode();`
`253`		`-`
`254`		`- return new MemberDefinition(member, GetMemberDefinitionForNode(innerNode, logger).Type, arrayNode.Count);`
	`250`	`+ return new MemberDefinition(member, GetMemberDefinitionForNode(wrapperNode.InnerNode, logger).Type, arrayNode.Count);`
`255`	`251`	`}`
`256`	`252`	`}`
`257`	`253`