From f205eaa07b817371e81160f4f2927546ea530406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Srbeck=C3=BD?= Date: Wed, 9 Jul 2008 00:52:41 +0000 Subject: [PATCH] Pretty printing of unit tests: Collapsed Is* into one property. Inline enumerators. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3197 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Metadata/DebugType.cs | 85 ++- .../Debugger.Core/Project/Src/Values/Value.cs | 4 +- .../Project/Src/DebuggerTestsBase.cs | 10 +- .../Project/Src/TestPrograms/ArrayValue.cs | 44 +- .../Project/Src/TestPrograms/DebugTypes.cs | 672 ++++-------------- .../Project/Src/TestPrograms/DefinedTypes.cs | 28 +- .../TestPrograms/FunctionArgumentVariables.cs | 6 +- .../TestPrograms/FunctionLocalVariables.cs | 2 +- .../Project/Src/TestPrograms/Generics.cs | 112 +-- .../Src/TestPrograms/PrimitiveValue.cs | 112 +-- .../Project/Src/TestPrograms/ValueType.cs | 42 +- 11 files changed, 292 insertions(+), 825 deletions(-) diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs index 5d9981b799..64b74d168d 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs @@ -12,6 +12,8 @@ using Debugger.Wrappers.MetaData; namespace Debugger.MetaData { + public enum DebugTypeKind { Array, Class, ValueType, Primitive, Pointer, Void }; + /// /// Represents a type in a debugee. That is, a class, array, value type or a primitive type. /// This class mimics the class. @@ -19,15 +21,6 @@ namespace Debugger.MetaData /// /// If two types are identical, the references to DebugType will also be identical /// Type will be loaded once per each appdomain. - /// - /// Preciesly one of these properties shall be true - /// - IsArray - /// - IsClass - /// - IsValueType - /// - IsPrimitive - /// - IsPointer - /// - IsVoid - /// /// public partial class DebugType: DebuggerObject { @@ -167,60 +160,82 @@ namespace Debugger.MetaData } } + /// Returns what kind of type this is. (eg. value type) + public DebugTypeKind Kind { + get { + switch (this.corElementType) { + case CorElementType.BOOLEAN: + case CorElementType.CHAR: + case CorElementType.I1: + case CorElementType.U1: + case CorElementType.I2: + case CorElementType.U2: + case CorElementType.I4: + case CorElementType.U4: + case CorElementType.I8: + case CorElementType.U8: + case CorElementType.R4: + case CorElementType.R8: + case CorElementType.I: + case CorElementType.U: + case CorElementType.STRING: return DebugTypeKind.Primitive; + case CorElementType.ARRAY: + case CorElementType.SZARRAY: return DebugTypeKind.Array; + case CorElementType.CLASS: + case CorElementType.OBJECT: return DebugTypeKind.Class; + case CorElementType.VALUETYPE: return DebugTypeKind.ValueType; + case CorElementType.PTR: + case CorElementType.BYREF: return DebugTypeKind.Pointer; + case CorElementType.VOID: return DebugTypeKind.Void; + default: throw new DebuggerException("Unknown kind of type"); + } + } + } + /// Gets a value indicating whether the type is an array + [Tests.Ignore] public bool IsArray { get { - return this.corElementType == CorElementType.ARRAY || - this.corElementType == CorElementType.SZARRAY; + return this.Kind == DebugTypeKind.Array; } } /// Gets a value indicating whether the type is a class + [Tests.Ignore] public bool IsClass { - get { - return this.corElementType == CorElementType.CLASS || - this.corElementType == CorElementType.OBJECT; + get { + return this.Kind == DebugTypeKind.Class; } } /// Returns true if this type represents interface + [Tests.Ignore] public bool IsInterface { get { - return IsClass && classProps.IsInterface; + return this.Kind == DebugTypeKind.Class && classProps.IsInterface; } } /// Gets a value indicating whether the type is a value type (that is, a structre in C#). /// Return false, if the type is a primitive type. + [Tests.Ignore] public bool IsValueType { get { - return this.corElementType == CorElementType.VALUETYPE; + return this.Kind == DebugTypeKind.ValueType; } } /// Gets a value indicating whether the type is a primitive type /// Primitive types are: boolean, char, string and all numeric types + [Tests.Ignore] public bool IsPrimitive { get { - return this.corElementType == CorElementType.BOOLEAN || - this.corElementType == CorElementType.CHAR || - this.corElementType == CorElementType.I1 || - this.corElementType == CorElementType.U1 || - this.corElementType == CorElementType.I2 || - this.corElementType == CorElementType.U2 || - this.corElementType == CorElementType.I4 || - this.corElementType == CorElementType.U4 || - this.corElementType == CorElementType.I8 || - this.corElementType == CorElementType.U8 || - this.corElementType == CorElementType.R4 || - this.corElementType == CorElementType.R8 || - this.corElementType == CorElementType.I || - this.corElementType == CorElementType.U || - this.corElementType == CorElementType.STRING; + return this.Kind == DebugTypeKind.Primitive; } } /// Gets a value indicating whether the type is an integer type + [Tests.Ignore] public bool IsInteger { get { return this.corElementType == CorElementType.I1 || @@ -237,6 +252,7 @@ namespace Debugger.MetaData } /// Gets a value indicating whether the type is an string + [Tests.Ignore] public bool IsString { get { return this.corElementType == CorElementType.STRING; @@ -244,17 +260,18 @@ namespace Debugger.MetaData } /// Gets a value indicating whether the type is an managed or unmanaged pointer + [Tests.Ignore] public bool IsPointer { get { - return this.corElementType == CorElementType.PTR || - this.corElementType == CorElementType.BYREF; + return this.Kind == DebugTypeKind.Pointer; } } /// Gets a value indicating whether the type is the void type + [Tests.Ignore] public bool IsVoid { get { - return this.corElementType == CorElementType.VOID; + return this.Kind == DebugTypeKind.Void; } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs index 6c2f823f57..0dad0b8e62 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs @@ -49,7 +49,9 @@ namespace Debugger if (this.Type.IsClass) return "{" + this.Type.FullName + "}"; if (this.Type.IsValueType) return "{" + this.Type.FullName + "}"; if (this.Type.IsPrimitive) return PrimitiveValue.ToString(); - if (this.Type.IsPointer) return "0x" + this.CorValue.CastTo().Address.ToString("X8"); + // Does not work well with unit tests: (variable value) + // if (this.Type.IsPointer) return "0x" + this.CorValue.CastTo().Address.ToString("X8"); + if (this.Type.IsPointer) return "{" + this.Type.FullName + "}"; if (this.Type.IsVoid) return "void"; throw new DebuggerException("Unknown type"); } diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs index 009bfa290b..9e01de99d3 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs @@ -267,8 +267,16 @@ namespace Debugger.Tests val = "{Exception: " + e.Message + "}"; } if (val == null) val = "null"; + if (val is IEnumerable && !(val is string)) { + List vals = new List(); + foreach(object o in (IEnumerable)val) { + vals.Add(o.ToString()); + } + container.SetAttribute(property.Name, "{" + string.Join(", ", vals.ToArray()) + "}"); + } else { + container.SetAttribute(property.Name, val.ToString()); + } - container.SetAttribute(property.Name, val.ToString()); if (ShouldExpandProperty(property)) { XmlElement propertyNode = doc.CreateElement(property.Name); diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs index 2aac147fca..5317704673 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ArrayValue.cs @@ -57,7 +57,7 @@ namespace Debugger.Tests { Break null diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs index 23ae64dc23..302a581d9b 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DebugTypes.cs @@ -106,17 +106,9 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="null" FullName="System.Object" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="mscorlib.dll"> null @@ -139,17 +131,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.String" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="True" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -172,17 +156,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="True" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -205,17 +181,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="True" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -227,7 +195,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F470" + AsString="{System.Int32*}" Expression="locPtr" IsInvalid="False" IsNull="False" @@ -238,34 +206,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32" FullName="System.Int32*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -279,7 +231,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F46C" + AsString="{System.Int32*}" Expression="locPtrByRef" IsInvalid="False" IsNull="False" @@ -290,34 +242,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32" FullName="System.Int32*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -331,7 +267,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F468" + AsString="{System.Int32**}" Expression="locPtrPtr" IsInvalid="False" IsNull="False" @@ -342,51 +278,27 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32*" FullName="System.Int32**" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -402,7 +314,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F464" + AsString="{System.Void*}" Expression="locVoidPtr" IsInvalid="False" IsNull="False" @@ -413,34 +325,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Void" FullName="System.Void*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -465,17 +361,9 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="null" FullName="System.Object" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="mscorlib.dll"> null @@ -498,17 +386,9 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="null" FullName="System.Object" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="mscorlib.dll"> null @@ -517,7 +397,7 @@ namespace Debugger.Tests { null @@ -569,7 +433,7 @@ namespace Debugger.Tests { null @@ -635,17 +483,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Point" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="ValueType" Module="DebugTypes.exe"> null @@ -657,7 +497,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F454" + AsString="{Point*}" Expression="locStructPtr" IsInvalid="False" IsNull="False" @@ -668,34 +508,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="Point" FullName="Point*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -720,17 +544,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}" + Kind="ValueType" Module="mscorlib.dll"> null @@ -758,17 +574,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="True" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -791,17 +599,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="True" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -813,7 +613,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F424" + AsString="{System.Int32*}" Expression="argPtr" IsInvalid="False" IsNull="False" @@ -824,34 +624,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32" FullName="System.Int32*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -865,7 +649,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F46C" + AsString="{System.Int32*}" Expression="argPtrByRef" IsInvalid="False" IsNull="False" @@ -876,34 +660,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32" FullName="System.Int32*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -917,7 +685,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F41C" + AsString="{System.Int32**}" Expression="argPtrPtr" IsInvalid="False" IsNull="False" @@ -928,51 +696,27 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Int32*" FullName="System.Int32**" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -988,7 +732,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F418" + AsString="{System.Void*}" Expression="argVoidPtr" IsInvalid="False" IsNull="False" @@ -999,34 +743,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="System.Void" FullName="System.Void*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -1051,17 +779,9 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="null" FullName="System.Object" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="mscorlib.dll"> null @@ -1084,17 +804,9 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="null" FullName="System.Object" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="mscorlib.dll"> null @@ -1103,7 +815,7 @@ namespace Debugger.Tests { null @@ -1155,7 +851,7 @@ namespace Debugger.Tests { null @@ -1221,17 +901,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Point" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="ValueType" Module="DebugTypes.exe"> null @@ -1254,17 +926,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Point" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="ValueType" Module="DebugTypes.exe"> null @@ -1276,7 +940,7 @@ namespace Debugger.Tests { ArrayDimensions="{Exception: Value is not an array}" ArrayLenght="{Exception: Value is not an array}" ArrayRank="{Exception: Value is not an array}" - AsString="0x0012F3F8" + AsString="{Point*}" Expression="argStructPtr" IsInvalid="False" IsNull="False" @@ -1287,34 +951,18 @@ namespace Debugger.Tests { BaseType="{Exception: Value does not fall within the expected range.}" ElementType="Point" FullName="Point*" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="True" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Pointer" Module="{Exception: The type is not a class or value type.}"> null @@ -1339,17 +987,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}" + Kind="ValueType" Module="mscorlib.dll"> null @@ -1372,17 +1012,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{System.IComparable, System.IFormattable, System.IConvertible}" + Kind="ValueType" Module="mscorlib.dll"> null diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs index 94e0627963..d8e7a9a842 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/DefinedTypes.cs @@ -70,17 +70,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="Debugger.Tests.TestPrograms.DefinedTypes_Class" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Class" Module="DefinedTypes.exe" /> @@ -88,17 +80,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.TestPrograms.DefinedTypes_Struct" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="ValueType" Module="DefinedTypes.exe" /> diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs index 37872210db..dba214bc15 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/FunctionArgumentVariables.cs @@ -212,7 +212,7 @@ namespace Debugger.Tests { Count="1"> @@ -228,17 +220,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericClass<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="Class" Module="Generics.exe" /> @@ -299,17 +283,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericClass<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="Class" Module="Generics.exe" /> @@ -370,17 +346,9 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericClass<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="True" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="Class" Module="Generics.exe" /> @@ -441,17 +409,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericStruct<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="ValueType" Module="Generics.exe" /> @@ -512,17 +472,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericStruct<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="ValueType" Module="Generics.exe" /> @@ -583,17 +535,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericStruct<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="ValueType" Module="Generics.exe" /> @@ -654,17 +598,9 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.TestPrograms.GenericStruct<System.Int32,System.String>" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{System.Int32, System.String}" + Interfaces="{}" + Kind="ValueType" Module="Generics.exe" /> diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs index 623792e704..1a8205902f 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/PrimitiveValue.cs @@ -75,34 +75,18 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Boolean" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -127,34 +111,18 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Int32" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="True" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -179,34 +147,18 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.String" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="True" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null @@ -231,34 +183,18 @@ namespace Debugger.Tests { BaseType="System.Object" ElementType="null" FullName="System.Double" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="True" - IsString="False" - IsValueType="False" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="Primitive" Module="{Exception: The type is not a class or value type.}"> null diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs index 6f14d5eb52..0b0acdda58 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/TestPrograms/ValueType.cs @@ -69,51 +69,27 @@ namespace Debugger.Tests { BaseType="System.ValueType" ElementType="null" FullName="Debugger.Tests.ValueType" - GenericArguments="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - Interfaces="System.Collections.Generic.List`1[Debugger.MetaData.DebugType]" - IsArray="False" - IsClass="False" - IsInteger="False" - IsInterface="False" - IsPointer="False" - IsPrimitive="False" - IsString="False" - IsValueType="True" - IsVoid="False" + GenericArguments="{}" + Interfaces="{}" + Kind="ValueType" Module="ValueType.exe"> null