Moving InvokeResult to InvocationsAPI.cs and extracting immutable interface from it.

Author: nerzhulart

Mono.Debugger.Soft/Mono.Debugger.Soft/IInvocableMethodOwnerMirror.cs

@@ -15,6 +15,6 @@ public interface IInvocableMethodOwnerMirror : IMirror
 		/// Make some additional processing of invocation result. See implementation in <see cref="StructMirror"/>
 		/// </summary>
 		/// <param name="result"></param>
-		void ProcessResult (InvokeResult result);
+		void ProcessResult (IInvokeResult result);
 	}
 }

Mono.Debugger.Soft/Mono.Debugger.Soft/InvocationsAPI.cs

@@ -5,6 +5,28 @@
 
 namespace Mono.Debugger.Soft
 {
+	public interface IInvokeResult
+	{
+		/// <summary>
+		/// Return value of invoked method
+		/// </summary>
+		Value Result { get; }
+
+		/// <summary>
+		/// The value of the receiver after the call for calls to valuetype methods or null.
+		/// Only set when using the InvokeOptions.ReturnOutThis flag.
+		/// Since protocol version 2.35
+		/// </summary>
+		Value OutThis { get; }
+
+		/// <summary>
+		/// The value of the arguments after the call
+		/// Only set when using the InvokeOptions.ReturnOutArgs flag.
+		/// Since protocol version 2.35
+		/// </summary>
+		Value[] OutArgs { get; }
+	}
+
 	/// <summary>
 	/// A bunch of extension methods to <see cref="IInvocableMethodOwnerMirror"/> to perform invocations on objects
 	/// </summary>
@@ -27,7 +49,7 @@ public static Value EndInvokeMethod (this IInvocableMethodOwnerMirror mirror, IA
 			return EndInvokeMethodInternal (mirror, asyncResult);
 		}
 
-		public static InvokeResult EndInvokeMethodWithResult (this IInvocableMethodOwnerMirror mirror, IAsyncResult asyncResult) {
+		public static IInvokeResult EndInvokeMethodWithResult (this IInvocableMethodOwnerMirror mirror, IAsyncResult asyncResult) {
 			return  EndInvokeMethodInternalWithResult (mirror, asyncResult);
 		}
 
@@ -46,8 +68,8 @@ public static Task<Value> InvokeMethodAsync (this IInvocableMethodOwnerMirror mi
 			return tcs.Task;
 		}
 
-		public static Task<InvokeResult> InvokeMethodAsyncWithResult (this IInvocableMethodOwnerMirror mirror, ThreadMirror thread, MethodMirror method, IList<Value> arguments, InvokeOptions options = InvokeOptions.None) {
-			var tcs = new TaskCompletionSource<InvokeResult> ();
+		public static Task<IInvokeResult> InvokeMethodAsyncWithResult (this IInvocableMethodOwnerMirror mirror, ThreadMirror thread, MethodMirror method, IList<Value> arguments, InvokeOptions options = InvokeOptions.None) {
+			var tcs = new TaskCompletionSource<IInvokeResult> ();
 			BeginInvokeMethod (mirror, thread, method, arguments, options, iar =>
 			{
 				try {
@@ -149,6 +171,14 @@ public void Abort ()
 			}
 		}
 
+		class InvokeResult : IInvokeResult
+		{
+			public Value Result { get; set; }
+			public Value OutThis { get; set; }
+			public Value[] OutArgs { get; set; }
+		}
+
+
 		static IInvokeAsyncResult BeginInvokeMethod (VirtualMachine vm, ThreadMirror thread, MethodMirror method, Value this_obj, IList<Value> arguments, InvokeOptions options, AsyncCallback callback, object state) {
 			if (thread == null)
 				throw new ArgumentNullException ("thread");

Mono.Debugger.Soft/Mono.Debugger.Soft/ObjectMirror.cs

@@ -1,26 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Mono.Debugger.Soft
 {
-	public class InvokeResult {
-		public Value Result { get; set; }
-		//
-		// The value of the receiver after the call for calls to valuetype methods or null.
-		// Only set when using the InvokeOptions.ReturnOutThis flag.
-		// Since protocol version 2.35
-		//
-		public Value OutThis { get; set; }
-		//
-		// The value of the arguments after the call
-		// Only set when using the InvokeOptions.ReturnOutArgs flag.
-		// Since protocol version 2.35
-		//
-		public Value[] OutArgs { get; set; }
-	}
-
 	public class ObjectMirror : Value, IInvocableMethodOwnerMirror {
 		TypeMirror type;
 		AppDomainMirror domain;
@@ -145,7 +127,7 @@ Value IInvocableMethodOwnerMirror.GetThisObject () {
 			return this;
 		}
 
-		void IInvocableMethodOwnerMirror.ProcessResult (InvokeResult result)
+		void IInvocableMethodOwnerMirror.ProcessResult (IInvokeResult result)
 		{
 		}
 	}

Mono.Debugger.Soft/Mono.Debugger.Soft/PrimitiveValue.cs

@@ -35,7 +35,7 @@ Value IInvocableMethodOwnerMirror.GetThisObject () {
 			return this;
 		}
 
-		void IInvocableMethodOwnerMirror.ProcessResult (InvokeResult result)
+		void IInvocableMethodOwnerMirror.ProcessResult (IInvokeResult result)
 		{
 		}
 

Mono.Debugger.Soft/Mono.Debugger.Soft/StructMirror.cs

@@ -68,7 +68,7 @@ Value IInvocableMethodOwnerMirror.GetThisObject () {
 			return this;
 		}
 
-		void IInvocableMethodOwnerMirror.ProcessResult (InvokeResult result)
+		void IInvocableMethodOwnerMirror.ProcessResult (IInvokeResult result)
 		{
 			var outThis = result.OutThis as StructMirror;
 			if (outThis != null) {

Mono.Debugger.Soft/Mono.Debugger.Soft/TypeMirror.cs

@@ -866,7 +866,7 @@ Value IInvocableMethodOwnerMirror.GetThisObject () {
 			return null;
 		}
 
-		void IInvocableMethodOwnerMirror.ProcessResult (InvokeResult result)
+		void IInvocableMethodOwnerMirror.ProcessResult (IInvokeResult result)
 		{
 		}
 	}

Mono.Debugging.Soft/SoftDebuggerAdaptor.cs

@@ -2177,7 +2177,7 @@ class MethodCall: AsyncOperation
 		readonly object obj;
 		IAsyncResult handle;
 		Exception exception;
-		InvokeResult result;
+		IInvokeResult result;
 
 		public MethodCall (SoftEvaluationContext ctx, MethodMirror function, object obj, Value[] args, bool enableOutArgs)
 		{