Format func ptr sigs

CreateAndInject · Oct 19, 2017 · 6ae40d6 · 6ae40d6
1 parent e63d02e
commit 6ae40d6
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 7 deletions.
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/TypeFormatter.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger.DotNet.CorDebug/dndbg/Engine/TypeFormatter.cs
@@ -767,7 +767,25 @@ public void Write(TypeSig type, IList<CorType> typeGenArgs = null, IList<CorType
 					break;
 
 				case ElementType.FnPtr:
-					OutputWrite("fnptr", TypeColor.Keyword);
+					var sig = ((FnPtrSig)type).MethodSig;
+					Write(sig.RetType, typeGenArgs, methGenArgs);
+					WriteSpace();
+					OutputWrite("(", TypeColor.Punctuation);
+					for (int i = 0; i < sig.Params.Count; i++) {
+						if (i > 0)
+							WriteCommaSpace();
+						Write(sig.Params[i], typeGenArgs, methGenArgs);
+					}
+					if (sig.ParamsAfterSentinel != null) {
+						if (sig.Params.Count > 0)
+							WriteCommaSpace();
+						OutputWrite("...", TypeColor.Punctuation);
+						for (int i = 0; i < sig.ParamsAfterSentinel.Count; i++) {
+							WriteCommaSpace();
+							Write(sig.ParamsAfterSentinel[i], typeGenArgs, methGenArgs);
+						}
+					}
+					OutputWrite(")", TypeColor.Punctuation);
 					break;
 
 				case ElementType.CModReqd:

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Shared/Debugger/Formatters/CSharp/CSharpTypeFormatter.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Shared/Debugger/Formatters/CSharp/CSharpTypeFormatter.cs
@@ -40,6 +40,8 @@ struct CSharpTypeFormatter {
 		const string GENERICS_CLOSE_PAREN = ">";
 		const string TUPLE_OPEN_PAREN = "(";
 		const string TUPLE_CLOSE_PAREN = ")";
+		const string METHOD_OPEN_PAREN = "(";
+		const string METHOD_CLOSE_PAREN = ")";
 		const string HEX_PREFIX = "0x";
 		const string COMMENT_BEGIN = "/*";
 		const string COMMENT_END = "*/";
@@ -256,8 +258,27 @@ public void Format(DmdType type, DbgDotNetValue value) {
 					break;
 
 				case DmdTypeSignatureKind.FunctionPointer:
-					//TODO:
-					OutputWrite("fnptr", BoxedTextColor.Keyword);
+					var sig = type.GetFunctionPointerMethodSignature();
+					Format(sig.ReturnType, null);
+					WriteSpace();
+					OutputWrite(METHOD_OPEN_PAREN, BoxedTextColor.Punctuation);
+					var types = sig.GetParameterTypes();
+					for (int i = 0; i < types.Count; i++) {
+						if (i > 0)
+							WriteCommaSpace();
+						Format(types[i], null);
+					}
+					types = sig.GetVarArgsParameterTypes();
+					if (types.Count > 0) {
+						if (sig.GetParameterTypes().Count > 0)
+							WriteCommaSpace();
+						OutputWrite("...", BoxedTextColor.Punctuation);
+						for (int i = 0; i < types.Count; i++) {
+							WriteCommaSpace();
+							Format(types[i], null);
+						}
+					}
+					OutputWrite(METHOD_CLOSE_PAREN, BoxedTextColor.Punctuation);
 					break;
 
 				default:

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Shared/Debugger/Formatters/VisualBasic/VisualBasicTypeFormatter.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Shared/Debugger/Formatters/VisualBasic/VisualBasicTypeFormatter.cs
@@ -41,6 +41,8 @@ struct VisualBasicTypeFormatter {
 		const string GENERICS_OF_KEYWORD = "Of";
 		const string TUPLE_OPEN_PAREN = "(";
 		const string TUPLE_CLOSE_PAREN = ")";
+		const string METHOD_OPEN_PAREN = "(";
+		const string METHOD_CLOSE_PAREN = ")";
 		const string HEX_PREFIX = "&H";
 		const string COMMENT_BEGIN = "/*";
 		const string COMMENT_END = "*/";
@@ -269,8 +271,27 @@ public void Format(DmdType type, DbgDotNetValue value) {
 					break;
 
 				case DmdTypeSignatureKind.FunctionPointer:
-					//TODO:
-					OutputWrite("fnptr", BoxedTextColor.Keyword);
+					var sig = type.GetFunctionPointerMethodSignature();
+					Format(sig.ReturnType, null);
+					WriteSpace();
+					OutputWrite(METHOD_OPEN_PAREN, BoxedTextColor.Punctuation);
+					var types = sig.GetParameterTypes();
+					for (int i = 0; i < types.Count; i++) {
+						if (i > 0)
+							WriteCommaSpace();
+						Format(types[i], null);
+					}
+					types = sig.GetVarArgsParameterTypes();
+					if (types.Count > 0) {
+						if (sig.GetParameterTypes().Count > 0)
+							WriteCommaSpace();
+						OutputWrite("...", BoxedTextColor.Punctuation);
+						for (int i = 0; i < types.Count; i++) {
+							WriteCommaSpace();
+							Format(types[i], null);
+						}
+					}
+					OutputWrite(METHOD_CLOSE_PAREN, BoxedTextColor.Punctuation);
 					break;
 
 				default:

diff --git a/dnSpy/dnSpy.Decompiler/CSharp/CSharpFormatter.cs b/dnSpy/dnSpy.Decompiler/CSharp/CSharpFormatter.cs
@@ -986,7 +986,25 @@ void Write(TypeSig type, IList<TypeSig> typeGenArgs, IList<TypeSig> methGenArgs)
 					break;
 
 				case ElementType.FnPtr:
-					OutputWrite("fnptr", BoxedTextColor.Keyword);
+					var sig = ((FnPtrSig)type).MethodSig;
+					Write(sig.RetType, typeGenArgs, methGenArgs);
+					WriteSpace();
+					OutputWrite(MethodParenOpen, BoxedTextColor.Punctuation);
+					for (int i = 0; i < sig.Params.Count; i++) {
+						if (i > 0)
+							WriteCommaSpace();
+						Write(sig.Params[i], typeGenArgs, methGenArgs);
+					}
+					if (sig.ParamsAfterSentinel != null) {
+						if (sig.Params.Count > 0)
+							WriteCommaSpace();
+						OutputWrite("...", BoxedTextColor.Punctuation);
+						for (int i = 0; i < sig.ParamsAfterSentinel.Count; i++) {
+							WriteCommaSpace();
+							Write(sig.ParamsAfterSentinel[i], typeGenArgs, methGenArgs);
+						}
+					}
+					OutputWrite(MethodParenClose, BoxedTextColor.Punctuation);
 					break;
 
 				case ElementType.CModReqd:

diff --git a/dnSpy/dnSpy.Decompiler/VisualBasic/VisualBasicFormatter.cs b/dnSpy/dnSpy.Decompiler/VisualBasic/VisualBasicFormatter.cs
@@ -1006,7 +1006,25 @@ void Write(TypeSig type, IList<TypeSig> typeGenArgs, IList<TypeSig> methGenArgs)
 					break;
 
 				case ElementType.FnPtr:
-					OutputWrite("fnptr", BoxedTextColor.Keyword);
+					var sig = ((FnPtrSig)type).MethodSig;
+					Write(sig.RetType, typeGenArgs, methGenArgs);
+					WriteSpace();
+					OutputWrite(MethodParenOpen, BoxedTextColor.Punctuation);
+					for (int i = 0; i < sig.Params.Count; i++) {
+						if (i > 0)
+							WriteCommaSpace();
+						Write(sig.Params[i], typeGenArgs, methGenArgs);
+					}
+					if (sig.ParamsAfterSentinel != null) {
+						if (sig.Params.Count > 0)
+							WriteCommaSpace();
+						OutputWrite("...", BoxedTextColor.Punctuation);
+						for (int i = 0; i < sig.ParamsAfterSentinel.Count; i++) {
+							WriteCommaSpace();
+							Write(sig.ParamsAfterSentinel[i], typeGenArgs, methGenArgs);
+						}
+					}
+					OutputWrite(MethodParenClose, BoxedTextColor.Punctuation);
 					break;
 
 				case ElementType.CModReqd: