Simplified code.

KN4CK3R · KN4CK3R · commit 83a4313a59d4 · 2019-01-10T19:07:52.000+01:00
diff --git a/ReClass.NET/CodeGenerator/CppCodeGenerator.cs b/ReClass.NET/CodeGenerator/CppCodeGenerator.cs
@@ -6,7 +6,6 @@
 using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
-using ReClassNET.Util;
 
 namespace ReClassNET.CodeGenerator
 {
@@ -117,7 +116,7 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 			return sb.ToString();
 		}
 
-		private IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes)
+		private static IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes)
 		{
 			Contract.Requires(classes != null);
 			Contract.Requires(Contract.ForAll(classes, c => c != null));
@@ -128,7 +127,7 @@ private IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes
 			return classes.SelectMany(c => YieldReversedHierarchy(c, alreadySeen)).Distinct();
 		}
 
-		private IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, HashSet<ClassNode> alreadySeen)
+		private static IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, ISet<ClassNode> alreadySeen)
 		{
 			Contract.Requires(node != null);
 			Contract.Requires(alreadySeen != null);
@@ -187,9 +186,9 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 
 					yield return new MemberDefinition(member, type, count);
 				}
-				else if (member is BitFieldNode)
+				else if (member is BitFieldNode bitFieldNode)
 				{
-					switch (((BitFieldNode)member).Bits)
+					switch (bitFieldNode.Bits)
 					{
 						case 8:
 							type = Program.Settings.TypeUInt8;
@@ -205,27 +204,23 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 							break;
 					}
 
-					yield return new MemberDefinition(member, type);
+					yield return new MemberDefinition(bitFieldNode, type);
 				}
-				else if (member is ClassInstanceArrayNode)
+				else if (member is ClassInstanceArrayNode classInstanceArrayNode)
 				{
-					var instanceArray = (ClassInstanceArrayNode)member;
-
-					yield return new MemberDefinition(member, instanceArray.InnerNode.Name, instanceArray.Count);
+					yield return new MemberDefinition(classInstanceArrayNode, classInstanceArrayNode.InnerNode.Name, classInstanceArrayNode.Count);
 				}
-				else if (member is ClassInstanceNode)
+				else if (member is ClassInstanceNode classInstanceNode)
 				{
-					yield return new MemberDefinition(member, ((ClassInstanceNode)member).InnerNode.Name);
+					yield return new MemberDefinition(classInstanceNode, classInstanceNode.InnerNode.Name);
 				}
-				else if (member is ClassPtrArrayNode)
+				else if (member is ClassPtrArrayNode ptrArrayNode)
 				{
-					var ptrArray = (ClassPtrArrayNode)member;
-
-					yield return new MemberDefinition(member, $"class {ptrArray.InnerNode.Name}*", ptrArray.Count);
+					yield return new MemberDefinition(ptrArrayNode, $"class {ptrArrayNode.InnerNode.Name}*", ptrArrayNode.Count);
 				}
-				else if (member is ClassPtrNode)
+				else if (member is ClassPtrNode classPtrNode)
 				{
-					yield return new MemberDefinition(member, $"class {((ClassPtrNode)member).InnerNode.Name}*");
+					yield return new MemberDefinition(classPtrNode, $"class {classPtrNode.InnerNode.Name}*");
 				}
 				else
 				{
@@ -247,7 +242,7 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 			}
 		}
 
-		private string MemberDefinitionToString(MemberDefinition member)
+		private static string MemberDefinitionToString(MemberDefinition member)
 		{
 			Contract.Requires(member != null);
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using ReClassNET.Extensions;`
`7`	`7`	`using ReClassNET.Logger;`
`8`	`8`	`using ReClassNET.Nodes;`
`9`		`-using ReClassNET.Util;`
`10`	`9`
`11`	`10`	`namespace ReClassNET.CodeGenerator`
`12`	`11`	`{`
`@@ -117,7 +116,7 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)`
`117`	`116`	`return sb.ToString();`
`118`	`117`	`}`
`119`	`118`
`120`		`- private IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes)`
	`119`	`+ private static IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes)`
`121`	`120`	`{`
`122`	`121`	`Contract.Requires(classes != null);`
`123`	`122`	`Contract.Requires(Contract.ForAll(classes, c => c != null));`
`@@ -128,7 +127,7 @@ private IEnumerable<ClassNode> OrderByInheritance(IEnumerable<ClassNode> classes`
`128`	`127`	`return classes.SelectMany(c => YieldReversedHierarchy(c, alreadySeen)).Distinct();`
`129`	`128`	`}`
`130`	`129`
`131`		`- private IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, HashSet<ClassNode> alreadySeen)`
	`130`	`+ private static IEnumerable<ClassNode> YieldReversedHierarchy(ClassNode node, ISet<ClassNode> alreadySeen)`
`132`	`131`	`{`
`133`	`132`	`Contract.Requires(node != null);`
`134`	`133`	`Contract.Requires(alreadySeen != null);`
`@@ -187,9 +186,9 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod`
`187`	`186`
`188`	`187`	`yield return new MemberDefinition(member, type, count);`
`189`	`188`	`}`
`190`		`- else if (member is BitFieldNode)`
	`189`	`+ else if (member is BitFieldNode bitFieldNode)`
`191`	`190`	`{`
`192`		`- switch (((BitFieldNode)member).Bits)`
	`191`	`+ switch (bitFieldNode.Bits)`
`193`	`192`	`{`
`194`	`193`	`case 8:`
`195`	`194`	`type = Program.Settings.TypeUInt8;`
`@@ -205,27 +204,23 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod`
`205`	`204`	`break;`
`206`	`205`	`}`
`207`	`206`
`208`		`- yield return new MemberDefinition(member, type);`
	`207`	`+ yield return new MemberDefinition(bitFieldNode, type);`
`209`	`208`	`}`
`210`		`- else if (member is ClassInstanceArrayNode)`
	`209`	`+ else if (member is ClassInstanceArrayNode classInstanceArrayNode)`
`211`	`210`	`{`
`212`		`- var instanceArray = (ClassInstanceArrayNode)member;`
`213`		`-`
`214`		`- yield return new MemberDefinition(member, instanceArray.InnerNode.Name, instanceArray.Count);`
	`211`	`+ yield return new MemberDefinition(classInstanceArrayNode, classInstanceArrayNode.InnerNode.Name, classInstanceArrayNode.Count);`
`215`	`212`	`}`
`216`		`- else if (member is ClassInstanceNode)`
	`213`	`+ else if (member is ClassInstanceNode classInstanceNode)`
`217`	`214`	`{`
`218`		`- yield return new MemberDefinition(member, ((ClassInstanceNode)member).InnerNode.Name);`
	`215`	`+ yield return new MemberDefinition(classInstanceNode, classInstanceNode.InnerNode.Name);`
`219`	`216`	`}`
`220`		`- else if (member is ClassPtrArrayNode)`
	`217`	`+ else if (member is ClassPtrArrayNode ptrArrayNode)`
`221`	`218`	`{`
`222`		`- var ptrArray = (ClassPtrArrayNode)member;`
`223`		`-`
`224`		`- yield return new MemberDefinition(member, $"class {ptrArray.InnerNode.Name}*", ptrArray.Count);`
	`219`	`+ yield return new MemberDefinition(ptrArrayNode, $"class {ptrArrayNode.InnerNode.Name}*", ptrArrayNode.Count);`
`225`	`220`	`}`
`226`		`- else if (member is ClassPtrNode)`
	`221`	`+ else if (member is ClassPtrNode classPtrNode)`
`227`	`222`	`{`
`228`		`- yield return new MemberDefinition(member, $"class {((ClassPtrNode)member).InnerNode.Name}*");`
	`223`	`+ yield return new MemberDefinition(classPtrNode, $"class {classPtrNode.InnerNode.Name}*");`
`229`	`224`	`}`
`230`	`225`	`else`
`231`	`226`	`{`
`@@ -247,7 +242,7 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod`
`247`	`242`	`}`
`248`	`243`	`}`
`249`	`244`
`250`		`- private string MemberDefinitionToString(MemberDefinition member)`
	`245`	`+ private static string MemberDefinitionToString(MemberDefinition member)`
`251`	`246`	`{`
`252`	`247`	`Contract.Requires(member != null);`
`253`	`248`