Moved a few files

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2189 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj

@@ -54,11 +54,6 @@
     <Compile Include="Src\Debugger\Internal\ManagedCallbackProxy.cs" />
     <Compile Include="Src\Debugger\Internal\MTA2STA.cs" />
     <Compile Include="Src\Debugger\NDebugger.cs" />
-    <Compile Include="Src\Interop enums\ClassFieldAttribute.cs" />
-    <Compile Include="Src\Interop enums\CorCallingConvention.cs" />
-    <Compile Include="Src\Interop enums\CorElementType.cs" />
-    <Compile Include="Src\Interop enums\CorMethodAttr.cs" />
-    <Compile Include="Src\Interop enums\CorTokenType.cs" />
     <Compile Include="Src\Modules\Module.cs" />
     <Compile Include="Src\Modules\ModuleEventArgs.cs" />
     <Compile Include="Src\Modules\Process-Modules.cs" />
@@ -370,18 +365,20 @@
     <Compile Include="Src\Variables\Variables\ArrayElement.cs" />
     <Compile Include="Src\Variables\Variables\LocalVariable.cs" />
     <Compile Include="Src\Variables\Variables\MethodArgument.cs" />
-    <Compile Include="Src\Variables\Variables\Variable.cs" />
-    <Compile Include="Src\Variables\Variables\VariableCollection.cs" />
-    <Compile Include="Src\Variables\Variables\VariableEventArgs.cs" />
     <Compile Include="Src\Variables\Types\MethodInfo.cs" />
     <Compile Include="Src\Variables\Types\MemberInfo.cs" />
     <Compile Include="Src\Variables\Types\PropertyInfo.cs" />
-    <Compile Include="Src\Variables\Variables\MemberVariable.cs" />
+    <Compile Include="Src\Variables\Variables\MemberValue.cs" />
     <Compile Include="Src\Variables\Values\Value-Helpers.cs" />
     <Compile Include="Src\Variables\Types\DebugType-Helpers.cs" />
     <Compile Include="Src\Debugger\NamespaceDoc.cs" />
     <Compile Include="Src\Variables\Values\NamedValue.cs" />
     <Compile Include="Src\Variables\Values\NamedValueCollection.cs" />
+    <Compile Include="Src\Interop\Enums\ClassFieldAttribute.cs" />
+    <Compile Include="Src\Interop\Enums\CorCallingConvention.cs" />
+    <Compile Include="Src\Interop\Enums\CorElementType.cs" />
+    <Compile Include="Src\Interop\Enums\CorMethodAttr.cs" />
+    <Compile Include="Src\Interop\Enums\CorTokenType.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="README.TXT" />
@@ -393,12 +390,13 @@
     <Folder Include="Src\Wrappers\CorSym\Autogenerated" />
     <Folder Include="Src\Wrappers\MetaData" />
     <Folder Include="docs" />
-    <Content Include="docs\Stepping.txt" />
     <Folder Include="Src\Variables" />
     <Folder Include="Src\Variables\Evals" />
     <Folder Include="Src\Variables\Types" />
     <Folder Include="Src\Variables\Values" />
     <Folder Include="Src\Variables\Variables" />
+    <Content Include="Src\Stepping.txt" />
+    <Folder Include="Src\Interop\Enums" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
+</Project>

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/ClassFieldAttribute.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2185 $</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorCallingConvention.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2185 $</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorElementType.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2185 $</version>
 // </file>
 
 namespace Debugger.Wrappers.CorDebug

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorMethodAttr.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2185 $</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Interop/Enums/CorTokenType.cs

@@ -2,7 +2,7 @@
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
+//     <version>$Revision: 2185 $</version>
 // </file>
 
 namespace Debugger.Wrappers.MetaData

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
-//			}
-//		}
 	}
 }

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<VariableCollection> 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;
-//			}
-//		}
 	}
 }

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/Variable.cs

@@ -1,16 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision: 2022 $</version>
-// </file>
-
-using System;
-using System.Collections.Generic;
-
-using Debugger.Wrappers.CorDebug;
-
-namespace Debugger
-{
-	
-}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableCollection.cs

@@ -1,107 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Debugger
-{
-//	public class NamedValueCollection: RemotingObjectBase, IEnumerable<NamedValue>
-//	{
-//		public static NamedValueCollection Empty = new NamedValueCollection(new NamedValue[0]);
-//		
-//		string name;
-//		string val;
-//		IEnumerable<NamedValueCollection> subCollectionsEnum;
-//		IEnumerable<NamedValue> collectionEnum;
-//		
-//		IEnumerator IEnumerable.GetEnumerator()
-//		{
-//			return GetEnumerator();
-//		}
-//		
-//		public IEnumerator<NamedValue> GetEnumerator()
-//		{
-//			return Items.GetEnumerator();
-//		}
-//		
-//		public string Name {
-//			get {
-//				return name;
-//			}
-//		}
-//		
-//		public string Value {
-//			get {
-//				return val;
-//			}
-//		}
-//		
-//		public IEnumerable<NamedValueCollection> SubCollections {
-//			get {
-//				return subCollectionsEnum;
-//			}
-//		}
-//		
-//		public IEnumerable<NamedValue> Items {
-//			get {
-//				return collectionEnum;
-//			}
-//		}
-//		
-//		public bool IsEmpty {
-//			get {
-//				return !SubCollections.GetEnumerator().MoveNext() &&
-//				       !Items.GetEnumerator().MoveNext();
-//			}
-//		}
-//		
-//		internal NamedValueCollection(IEnumerable<NamedValue> 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<NamedValueCollection> subCollectionsEnum, IEnumerable<NamedValue> 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;
-//		}
-//	}
-}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variables/VariableEventArgs.cs

@@ -1,27 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
-//     <version>$Revision$</version>
-// </file>
-
-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;
-//		}
-//	}
-}