diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj index 7a6799b2b9..9f2658f9d4 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj @@ -54,11 +54,6 @@ - - - - - @@ -370,18 +365,20 @@ - - - - + + + + + + @@ -393,12 +390,13 @@ - + + - + \ No newline at end of file diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/ClassFieldAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs similarity index 97% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/ClassFieldAttribute.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs index f58204a9bc..11f0bb8dd7 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/ClassFieldAttribute.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs @@ -2,7 +2,7 @@ // // // -// $Revision$ +// $Revision: 2185 $ // namespace Debugger.Wrappers.MetaData diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorCallingConvention.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs similarity index 95% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorCallingConvention.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs index d2b7270c22..0f7709921c 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorCallingConvention.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs @@ -2,7 +2,7 @@ // // // -// $Revision$ +// $Revision: 2185 $ // namespace Debugger.Wrappers.MetaData diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorElementType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs similarity index 97% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorElementType.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs index 22b8393981..c4d43b13af 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorElementType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs @@ -2,7 +2,7 @@ // // // -// $Revision$ +// $Revision: 2185 $ // namespace Debugger.Wrappers.CorDebug diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorMethodAttr.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs similarity index 98% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorMethodAttr.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs index 749bf6b669..711a5e095d 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorMethodAttr.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs @@ -2,7 +2,7 @@ // // // -// $Revision$ +// $Revision: 2185 $ // namespace Debugger.Wrappers.MetaData diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorTokenType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs similarity index 97% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorTokenType.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs index 0b3be782b1..fce022e6da 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop enums/CorTokenType.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs @@ -2,7 +2,7 @@ // // // -// $Revision$ +// $Revision: 2185 $ // namespace Debugger.Wrappers.MetaData diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/docs/Stepping.txt b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepping.txt similarity index 100% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/docs/Stepping.txt rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepping.txt diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Common.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Common.cs index 479abad2aa..81502b487c 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Common.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Common.cs @@ -32,41 +32,5 @@ namespace Debugger throw new DebuggerException("Unknown value type"); } } - -// public bool MayHaveSubVariables { -// get { -// #if DEBUG -// if (IsNull) return true; -// if (IsArray) return true; -// if (IsObject) return true; -// if (IsPrimitive) return true; -// #else -// if (IsNull) return false; -// if (IsArray) return true; -// if (IsObject) return true; -// if (IsPrimitive) return false; -// #endif -// throw new DebuggerException("Unknown value type"); -// } -// } -// -// public VariableCollection SubVariables { -// get { -// VariableCollection subVars = null; -// if (IsNull) subVars = new VariableCollection(new Variable[] {}); -// if (IsArray) subVars = new VariableCollection(GetArrayElements()); -// if (IsObject) subVars = this.ObjectSubVariables; -// if (IsPrimitive) subVars = new VariableCollection(new Variable[] {}); -// if (subVars == null) throw new DebuggerException("Unknown value type"); -// #if DEBUG -// return new VariableCollection(subVars.Name, -// subVars.Value, -// Util.MergeLists(this.GetDebugInfo(), subVars.SubCollections).ToArray(), -// subVars.Items); -// #else -// return subVars; -// #endif -// } -// } } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Object.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Object.cs index 73af2cc2f2..825709ebc2 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Object.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value-Object.cs @@ -89,42 +89,5 @@ namespace Debugger } } } - -// public VariableCollection ObjectSubVariables { -// get { -// return new VariableCollection(String.Empty, -// String.Empty, -// GetSubCollections(this.Type), -// GetSubVariables(this.Type, BindingFlags.Public | BindingFlags.Instance)); -// } -// } - -// IEnumerable GetSubCollections(DebugType type) -// { -// if (type.BaseType != null) { -// yield return new VariableCollection("Base class", -// "{" + type.BaseType.Name + "}", -// GetSubCollections(type.BaseType), -// GetSubVariables(type.BaseType, BindingFlags.Public | BindingFlags.Instance)); -// } -// VariableCollection privateStatic = new VariableCollection("Private static members", -// String.Empty, -// new VariableCollection[0], -// GetSubVariables(type, BindingFlags.NonPublic | BindingFlags.Static)); -// VariableCollection privateInstance = new VariableCollection("Private members", -// String.Empty, -// privateStatic.IsEmpty ? new VariableCollection[0] : new VariableCollection[] {privateStatic}, -// GetSubVariables(type, BindingFlags.NonPublic | BindingFlags.Instance)); -// if (!privateInstance.IsEmpty) { -// yield return privateInstance; -// } -// VariableCollection publicStatic = new VariableCollection("Static members", -// String.Empty, -// new VariableCollection[0], -// GetSubVariables(type, BindingFlags.Public | BindingFlags.Static)); -// if (!publicStatic.IsEmpty) { -// yield return publicStatic; -// } -// } } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberVariable.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs similarity index 100% rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberVariable.cs rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/MemberValue.cs diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/Variable.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/Variable.cs deleted file mode 100644 index d4d845cc92..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/Variable.cs +++ /dev/null @@ -1,16 +0,0 @@ -// -// -// -// -// $Revision: 2022 $ -// - -using System; -using System.Collections.Generic; - -using Debugger.Wrappers.CorDebug; - -namespace Debugger -{ - -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableCollection.cs deleted file mode 100644 index de74bbc2b7..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableCollection.cs +++ /dev/null @@ -1,107 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.Collections; -using System.Collections.Generic; - -namespace Debugger -{ -// public class NamedValueCollection: RemotingObjectBase, IEnumerable -// { -// public static NamedValueCollection Empty = new NamedValueCollection(new NamedValue[0]); -// -// string name; -// string val; -// IEnumerable subCollectionsEnum; -// IEnumerable collectionEnum; -// -// IEnumerator IEnumerable.GetEnumerator() -// { -// return GetEnumerator(); -// } -// -// public IEnumerator GetEnumerator() -// { -// return Items.GetEnumerator(); -// } -// -// public string Name { -// get { -// return name; -// } -// } -// -// public string Value { -// get { -// return val; -// } -// } -// -// public IEnumerable SubCollections { -// get { -// return subCollectionsEnum; -// } -// } -// -// public IEnumerable Items { -// get { -// return collectionEnum; -// } -// } -// -// public bool IsEmpty { -// get { -// return !SubCollections.GetEnumerator().MoveNext() && -// !Items.GetEnumerator().MoveNext(); -// } -// } -// -// internal NamedValueCollection(IEnumerable collectionEnum) -// :this(String.Empty, String.Empty, new VariableCollection[0], collectionEnum) -// { -// } -// -// public NamedValueCollection(string name, string val):this(name, val, null, null) -// { -// } -// -// public NamedValueCollection(string name, string val, IEnumerable subCollectionsEnum, IEnumerable collectionEnum) -// { -// this.name = name; -// this.val = val; -// this.subCollectionsEnum = subCollectionsEnum ?? new VariableCollection[0]; -// this.collectionEnum = collectionEnum ?? new Variable[0]; -// } -// -// -// public virtual NamedValue this[string variableName] { -// get { -// int index = variableName.IndexOf('.'); -// if (index != -1) { -// string rootVariable = variableName.Substring(0, index); -// string subVariable = variableName.Substring(index + 1); -// return this[rootVariable].Value.SubVariables[subVariable]; -// } else { -// foreach (Variable v in this) { -// if (v.Name == variableName) return v; -// } -// } -// throw new DebuggerException("Variable \"" + variableName + "\" is not in collection"); -// } -// } -// -// public override string ToString() -// { -// string txt = ""; -// foreach(Variable v in this) { -// txt += v.ToString() + "\n"; -// } -// return txt; -// } -// } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableEventArgs.cs deleted file mode 100644 index c296e4f1bd..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableEventArgs.cs +++ /dev/null @@ -1,27 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ -// public class VariableEventArgs: ProcessEventArgs -// { -// Variable variable; -// -// public Variable Variable { -// get { -// return variable; -// } -// } -// -// public VariableEventArgs(Variable variable): base(variable.Value.Process) -// { -// this.variable = variable; -// } -// } -}