Merge pull request #392 from xamarin/generic-tuple-test

wrap generic tuples

Author: stephen-hawley

SwiftReflector/MethodWrapping.cs

@@ -1840,7 +1840,7 @@ SLFunc MapTopLevelFuncToWrapperFunc (SLImportModules modules, FunctionDeclaratio
 					parms.Insert (0, new SLParameter (returnName, newReturnType));
 				} else {
 					if (funcDecl.IsTypeSpecGeneric (retType)) {
-						if (retType.ContainsGenericParameters) {
+						if (retType.ContainsGenericParameters || retType is TupleTypeSpec) {
 							SLType retSLType = typeMapper.TypeSpecMapper.MapType (funcDecl, modules, retType, true);
 							parms.Insert (0, new SLParameter (returnName,
 							                                  new SLBoundGenericType ("UnsafeMutablePointer", retSLType)));

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

@@ -1283,7 +1283,31 @@ public init(value: T?) {
 			var callingCode = CSCodeBlock.Create (printIt);
 
 			TestRunning.TestAndExecute (swiftCode, callingCode, "compiled\n");
+		}
+
+		[Test]
+		public void TestGenericTuple ()
+		{
+			var swiftCode = @"
+public func rotate<T>(x: (T, T, T)) -> (T, T, T)
+{
+	return (x.1, x.2, x.0)
 }
+";
+
+			// var t = new Tuple<nint, nint, nint>(1, 2, 3)
+			// var u = TopLevelFunctions.Rotate(t);
+			// Console.WriteLine (u);
 
+			var tID = new CSIdentifier ("t");
+			var uID = new CSIdentifier ("u");
+			var tDecl = CSVariableDeclaration.VarLine (tID, new CSFunctionCall ("Tuple<nint, nint, nint>", true,
+				CSConstant.Val (1), CSConstant.Val (2), CSConstant.Val (3)));
+			var uDecl = CSVariableDeclaration.VarLine (uID, new CSFunctionCall ("TopLevelEntities.Rotate", false, tID));
+			var printer = CSFunctionCall.ConsoleWriteLine (uID);
+			var callingCode = CSCodeBlock.Create (tDecl, uDecl, printer);
+
+			TestRunning.TestAndExecute (swiftCode, callingCode, "(2, 3, 1)\n");
+		}
 	}
 }