Added associated type descriptors

Author: Stephen Hawley

SwiftReflector/Demangling/Swift5NodeToTLDefinition.cs

@@ -819,6 +819,8 @@ public TLDefinition Convert (Node node)
 				return ConvertProtocolRequirementsBaseDescriptor (node);
 			case NodeKind.BaseConformanceDescriptor:
 				return ConvertBaseConformanceDescriptor (node);
+			case NodeKind.AssociatedTypeDescriptor:
+				return ConvertAssocatedTypeDescriptor (node);
 			default:
 				return null;
 			}
@@ -1147,6 +1149,15 @@ TLBaseConformanceDescriptor ConvertBaseConformanceDescriptor (Node node)
 			return new TLBaseConformanceDescriptor (mangledName, protocol.ClassName.Module, protocol, requirement, offset);
 		}
 
+		TLAssociatedTypeDescriptor ConvertAssocatedTypeDescriptor (Node node)
+		{
+			var name = new SwiftName (node.Children [0].Text, false);
+			var protocol = ConvertToSwiftType (node.Children [0].Children [0], false, null) as SwiftClassType;
+			if (protocol == null)
+				return null;
+			return new TLAssociatedTypeDescriptor (mangledName, protocol.ClassName.Module, protocol, name, offset);
+		}
+
 
 		// ConvertToFunctions are usually called from rules.
 

SwiftReflector/Demangling/TLDefinition.cs

@@ -232,5 +232,15 @@ public TLBaseConformanceDescriptor (string mangledName, SwiftName module, SwiftC
 		}
 		public SwiftClassType ProtocolRequirement { get; private set; }
 	}
+
+	public class TLAssociatedTypeDescriptor : TLClassElem {
+		public TLAssociatedTypeDescriptor (string mangledName, SwiftName module, SwiftClassType protocol, SwiftName associatedTypeName, ulong offset)
+			: base (CoreCompoundType.AssociatedTypeDescriptor, mangledName, module, protocol, offset)
+		{
+			AssociatedTypeName = associatedTypeName;
+		}
+
+		public SwiftName AssociatedTypeName { get; private set; }
+	}
 }
 

SwiftReflector/Enums.cs

@@ -31,6 +31,7 @@ public enum CoreCompoundType {
 		MetadataDescriptor,
 		ProtocolRequirementsBaseDescriptor,
 		BaseConformanceDescriptor,
+		AssociatedTypeDescriptor,
 	}
 
 	public enum CoreBuiltInType {

tests/tom-swifty-test/SwiftReflector/Swift4DemanglerTests.cs

@@ -1646,5 +1646,38 @@ public void TestBaseConformanceDescriptor ()
 			Assert.IsNotNull (cl, "not a class");
 			Assert.AreEqual ("Swift.Equatable", cl.ClassName.ToFullyQualifiedName (), "wrong name");
 		}
+
+		[Test]
+		public void TestAssociatedTypeDescriptor0 ()
+		{
+			var tld = Decomposer.Decompose ("_$s12RowValueType6Eureka04RuleC0PTl", false);
+			Assert.IsNotNull (tld, "failed decomposition");
+			var atdesc = tld as TLAssociatedTypeDescriptor;
+			Assert.IsNotNull (atdesc, "not an associated type desc");
+			Assert.AreEqual ("RowValueType", atdesc.AssociatedTypeName.Name, "wrong associated type name");
+			Assert.AreEqual ("Eureka.RuleType", atdesc.Class.ClassName.ToFullyQualifiedName (), "protocol name mismatch");
+		}
+
+		[Test]
+		public void TestAssociatedTypeDescriptor1 ()
+		{
+			var tld = Decomposer.Decompose ("_$s23PresentedControllerType6Eureka012PresenterRowC0PTl", false);
+			Assert.IsNotNull (tld, "failed decomposition");
+			var atdesc = tld as TLAssociatedTypeDescriptor;
+			Assert.IsNotNull (atdesc, "not an associated type desc");
+			Assert.AreEqual ("PresentedControllerType", atdesc.AssociatedTypeName.Name, "wrong associated type name");
+			Assert.AreEqual ("Eureka.PresenterRowType", atdesc.Class.ClassName.ToFullyQualifiedName (), "protocol name mismatch");
+		}
+
+		[Test]
+		public void TestAssociatedTypeDescriptor2 ()
+		{
+			var tld = Decomposer.Decompose ("_$s9InlineRow6Eureka0aB4TypePTl", false);
+			Assert.IsNotNull (tld, "failed decomposition");
+			var atdesc = tld as TLAssociatedTypeDescriptor;
+			Assert.IsNotNull (atdesc, "not an associated type desc");
+			Assert.AreEqual ("InlineRow", atdesc.AssociatedTypeName.Name, "wrong associated type name");
+			Assert.AreEqual ("Eureka.InlineRowType", atdesc.Class.ClassName.ToFullyQualifiedName (), "protocol name mismatch");
+		}
 	}
 }