Refactored cycle check.

Author: KN4CK3R

DataExchange/SchemaBuilder.cs

@@ -404,16 +404,16 @@ public static bool TryCreateNodeFromSchema(SchemaNode schemaNode, ClassNode pare
 			{
 				var schemaReferenceNode = schemaNode as SchemaReferenceNode;
 
-				if (node is ClassInstanceNode || node is ClassInstanceArrayNode)
+				try
 				{
-					if (!ClassManager.IsCycleFree(parentNode, classes[schemaReferenceNode.InnerNode], classes.Values))
-					{
-						logger.Log(LogLevel.Error, $"Skipping node with cycle reference: {node.Name}");
+					referenceNode.ChangeInnerNode(classes[schemaReferenceNode.InnerNode]);
+				}
+				catch (ClassCycleException)
+				{
+					logger.Log(LogLevel.Error, $"Skipping node with cycle reference: {node.Name}");
 
-						return false;
-					}
+					return false;
 				}
-				referenceNode.ChangeInnerNode(classes[schemaReferenceNode.InnerNode]);
 			}
 
 			var vtableNode = node as VTableNode;

Nodes/BaseReferenceNode.cs

@@ -45,7 +45,7 @@ public void ChangeInnerNode(ClassNode node)
 		/// <summary>Performs a class cycle check for the given class.</summary>
 		/// <exception cref="ClassCycleException">Thrown when a class cycle is present.</exception>
 		/// <param name="node">The class to check.</param>
-		private void PerformCycleCheck(ClassNode node)
+		public void PerformCycleCheck(ClassNode node)
 		{
 			Contract.Requires(node != null);
 

Nodes/ClassManager.cs

@@ -120,15 +120,15 @@ public static bool IsCycleFree(ClassNode parent, ClassNode check, IEnumerable<Cl
 				)
 			);
 
-			if (!IsCycleFreeUp(parent, toCheck, classes))
+			if (!IsCycleFree(parent, toCheck, classes))
 			{
 				return false;
 			}
 
 			return true;
 		}
 
-		private static bool IsCycleFreeUp(ClassNode root, HashSet<ClassNode> seen, IEnumerable<ClassNode> classes)
+		private static bool IsCycleFree(ClassNode root, HashSet<ClassNode> seen, IEnumerable<ClassNode> classes)
 		{
 			Contract.Requires(root != null);
 			Contract.Requires(seen != null);
@@ -148,7 +148,7 @@ private static bool IsCycleFreeUp(ClassNode root, HashSet<ClassNode> seen, IEnum
 					.Where(n => n.InnerNode == root)
 					.Any())
 				{
-					if (!IsCycleFreeUp(cls, seen, classes))
+					if (!IsCycleFree(cls, seen, classes))
 					{
 						return false;
 					}