Merge pull request #375 from xamarin/dynamic-self-indexer

Added test and a few fixes for Dynamic Self in subscripts

Author: stephen-hawley

SwiftReflector/OverrideBuilder.cs

@@ -781,6 +781,13 @@ SLSubscript DefineOverrideSubscript (FunctionDeclaration getter, FunctionDeclara
 
 			var idents = new List<string> ();
 			idents.Add ("self");
+
+			if (isProtocol) {
+				SubstituteForSelf = isExistential ? "XamGlue.EveryProtocol" : OverriddenClass.ToFullyQualifiedNameWithGenerics ();
+			} else {
+				SubstituteForSelf = null;
+			}
+
 			var getBlock = new SLCodeBlock (null);
 
 			{
@@ -809,6 +816,7 @@ SLSubscript DefineOverrideSubscript (FunctionDeclaration getter, FunctionDeclara
 				var ifblock = new SLCodeBlock (null);
 
 				var marshal = new MarshalEngineSwiftToCSharp (Imports, idents, typeMapper);
+				marshal.SubstituteForSelf = SubstituteForSelf;
 				ifblock.AddRange (marshal.MarshalFunctionCall (getter,
 					vtRef, VTableEntryIdentifier (index)));
 
@@ -855,6 +863,7 @@ SLSubscript DefineOverrideSubscript (FunctionDeclaration getter, FunctionDeclara
 				var ifblock = new SLCodeBlock (null);
 
 				var marshal = new MarshalEngineSwiftToCSharp (Imports, idents, typeMapper);
+				marshal.SubstituteForSelf = SubstituteForSelf;
 				ifblock.AddRange (marshal.MarshalFunctionCall (setter,
 									      vtRef, VTableEntryIdentifier (index + 1)));
 
@@ -876,11 +885,11 @@ SLSubscript DefineOverrideSubscript (FunctionDeclaration getter, FunctionDeclara
 			}
 			SLType returnType = null;
 			if (getter.IsTypeSpecGeneric (getter.ReturnTypeSpec)) {
-				var ns = (NamedTypeSpec)getter.ReturnTypeSpec;
+				var ns = (NamedTypeSpec)getter.ReturnTypeSpec.ReplaceName ("Self", SubstituteForSelf);
 				var depthIndex = getter.GetGenericDepthAndIndex (ns.Name);
 				returnType = new SLGenericReferenceType (depthIndex.Item1, depthIndex.Item2);
 			} else {
-				returnType = typeMapper.OverrideTypeSpecMapper.MapType (getter, Imports, getter.ReturnTypeSpec, true);
+				returnType = typeMapper.OverrideTypeSpecMapper.MapType (getter, Imports, getter.ReturnTypeSpec.ReplaceName ("Self", SubstituteForSelf), true);
 			}
 
 			return new SLSubscript (Visibility.Public, isProtocol ? FunctionKind.None : FunctionKind.Override, returnType,

SwiftReflector/SwiftXmlReflection/FunctionDeclaration.cs

@@ -359,7 +359,7 @@ public override bool HasDynamicSelf {
 
 		public override bool HasDynamicSelfInReturnOnly {
 			get {
-				if (IsProperty)
+				if (IsProperty && !IsSubscript)
 					return false;
 				if (TypeSpec.IsNullOrEmptyTuple (ReturnTypeSpec) || !ReturnTypeSpec.HasDynamicSelf)
 					return false;

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

@@ -210,5 +210,60 @@ public func whoProp<T> (a: T) where T: Identity4 {
 			TestRunning.TestAndExecute (swiftCode, callingCode, "Got here.\n", otherClass: auxClass, platform: PlatformName.macOS);
 
 		}
+
+
+		[Test]
+		[Ignore ("This test takes out the swift compiler when compiling wrappers")]
+		// issue opened here https://github.com/xamarin/binding-tools-for-swift/issues/374
+		public void TestSelfSubscriptGet ()
+		{
+			var swiftCode = @"
+public protocol Identity5 {
+	subscript (index: Int) -> Self {
+		get
+	}
+}
+
+public func whoScript <T> (a: T) where T : Identity5 {
+	a[7]
+}
+";
+
+			// public class Foo4 : IIdentity5<Foo4>
+			// {
+			//	public Foo4 () { }
+			//	public Foo4 this [nint index] {
+			//		get {
+			//			Console.WriteLine ("got here " + index);
+			//		}
+			//	}
+			// }
+			var auxClass = new CSClass (CSVisibility.Public, "Foo4");
+			var ifaceType = new CSSimpleType ("IIdentity5", false, auxClass.ToCSType ());
+			auxClass.Inheritance.Add (new CSIdentifier (ifaceType.ToString ()));
+
+			var ctor = new CSMethod (CSVisibility.Public, CSMethodKind.None, null, auxClass.Name,
+				new CSParameterList (), new CSCodeBlock ());
+
+			var indexIdent = new CSIdentifier ("index");
+
+			var getBody = CSCodeBlock.Create (CSFunctionCall.ConsoleWriteLine (CSConstant.Val (" got here ") + indexIdent));
+
+			var parameters = new CSParameterList (new CSParameter (new CSSimpleType ("nint"), indexIdent));
+
+			var indexer = new CSProperty (auxClass.ToCSType (), CSMethodKind.None, CSVisibility.Public, getBody,
+				CSVisibility.Public, null, parameters);
+
+			auxClass.Constructors.Add (ctor);
+			auxClass.Properties.Add (indexer);
+
+			var instName = new CSIdentifier ("inst");
+			var instDecl = CSVariableDeclaration.VarLine (instName, new CSFunctionCall (auxClass.Name, new Dynamo.CommaListElementCollection<CSBaseExpression> (), true));
+			var methodCall = CSFunctionCall.FunctionCallLine ("TopLevelEntities.WhoScript", false, instName);
+			var callingCode = CSCodeBlock.Create (instDecl, methodCall);
+
+			TestRunning.TestAndExecute (swiftCode, callingCode, "got here 7\n", otherClass: auxClass, platform: PlatformName.macOS);
+
+		}
 	}
 }