**** Merged from HEAD ****

2007-09-17 Martin Baulig <martin@ximian.com> * languages/TargetType.cs (TargetType): Renamed the abstract GetObject() into DoGetObject() and made it protected; added a new non-abstract GetObject() which just calls DoGetObject(). * languages/TargetLocation.cs (TargetLocation): Made this class public; but removed all public API entry points from it. (TargetLocation.HasAddress): Made this internal. (TargetLocation.GetAddress): Likewise. svn path=/branches/martin/debugger-generics/; revision=85872
mono · Sep 17, 2007 · 534a098 · 534a098
1 parent cc10354
commit 534a098
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 34 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2007-09-17  Martin Baulig  <martin@ximian.com>
+
+	* languages/TargetType.cs
+	(TargetType): Renamed the abstract GetObject() into DoGetObject()
+	and made it protected; added a new non-abstract GetObject() which
+	just calls DoGetObject().
+
+	* languages/TargetLocation.cs
+	(TargetLocation): Made this class public; but removed all public
+	API entry points from it.
+	(TargetLocation.HasAddress): Made this internal.
+	(TargetLocation.GetAddress): Likewise.
+
 2007-09-04  Martin Baulig  <martin@ximian.com>
 
 	* frontend/CSharpExpressionParser.jay

diff --git a/languages/AbsoluteTargetLocation.cs b/languages/AbsoluteTargetLocation.cs
@@ -14,11 +14,11 @@ public AbsoluteTargetLocation (TargetAddress address)
 			this.address = address;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return true; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			return address;
 		}

diff --git a/languages/BitfieldTargetLocation.cs b/languages/BitfieldTargetLocation.cs
@@ -16,11 +16,11 @@ public BitfieldTargetLocation (TargetLocation relative_to, int offset, int size)
 			this.bit_size = size;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return false; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			throw new InvalidOperationException ();
 		}

diff --git a/languages/ClientSuppliedTargetLocation.cs b/languages/ClientSuppliedTargetLocation.cs
@@ -14,11 +14,11 @@ public ClientSuppliedTargetLocation (TargetBlob blob)
 			this.blob = blob;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return false; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			throw new InvalidOperationException ();
 		}

diff --git a/languages/DereferencedTargetLocation.cs b/languages/DereferencedTargetLocation.cs
@@ -11,11 +11,11 @@ public DereferencedTargetLocation (TargetLocation reference)
 			this.reference = reference;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return reference.HasAddress; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			TargetAddress address = reference.GetAddress (target);
 			if (address.IsNull)

diff --git a/languages/RelativeTargetLocation.cs b/languages/RelativeTargetLocation.cs
@@ -16,11 +16,11 @@ public RelativeTargetLocation (TargetLocation relative_to, long offset)
 			this.offset = offset;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return relative_to.HasAddress; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			return relative_to.GetAddress (target) + offset;
 		}

diff --git a/languages/TargetEnumType.cs b/languages/TargetEnumType.cs
@@ -25,7 +25,7 @@ internal TargetObject GetValue (TargetLocation location)
 			return Value.Type.GetObject (location);
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new TargetEnumObject (this, location);
 		}

diff --git a/languages/TargetFundamentalType.cs b/languages/TargetFundamentalType.cs
@@ -129,7 +129,7 @@ public override int Size {
 			get { return size; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new TargetFundamentalObject (this, location);
 		}

diff --git a/languages/TargetLocation.cs b/languages/TargetLocation.cs
@@ -7,17 +7,17 @@ namespace Mono.Debugger.Languages
 	//   not always have an address for a variable (for instance if it's stored in a
 	//   register) and that an addresses lifetime may be limited.
 	// </summary>
-	internal abstract class TargetLocation
+	public abstract class TargetLocation
 	{
 		// <summary>
 		//   Whether this variable has an address.  A variable may not have an
 		//   address, for instance if it's stored in a register.
 		// </summary>
-		public abstract bool HasAddress {
+		internal abstract bool HasAddress {
 			get;
 		}
 
-		public abstract TargetAddress GetAddress (TargetMemoryAccess target);
+		internal abstract TargetAddress GetAddress (TargetMemoryAccess target);
 
 		internal virtual TargetBlob ReadMemory (Thread target, int size)
 		{

diff --git a/languages/TargetType.cs b/languages/TargetType.cs
@@ -67,7 +67,12 @@ internal void SetObject (Thread target, TargetLocation location,
 			location.WriteBuffer (target, contents);
 		}
 
-		internal abstract TargetObject GetObject (TargetLocation location);
+		internal TargetObject GetObject (TargetLocation location)
+		{
+			return DoGetObject (location);
+		}
+
+		protected abstract TargetObject DoGetObject (TargetLocation location);
 
 		public virtual bool ContainsGenericParameters {
 			get { return false; }

diff --git a/languages/mono/MonoArrayType.cs b/languages/mono/MonoArrayType.cs
@@ -29,7 +29,7 @@ protected override TargetType DoInflateType (MonoGenericContext context)
 			return new MonoArrayType (ElementType.InflateType (context), Rank);
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new MonoArrayObject (this, location);
 		}

diff --git a/languages/mono/MonoClassType.cs b/languages/mono/MonoClassType.cs
@@ -415,7 +415,7 @@ internal MonoClassInfo ClassResolved (Thread target, TargetAddress klass)
 			return type_info;
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new MonoClassObject (this, location);
 		}

diff --git a/languages/mono/MonoFunctionType.cs b/languages/mono/MonoFunctionType.cs
@@ -165,7 +165,7 @@ public override TargetAddress GetMethodAddress (Thread target)
 			return klass.MonoClassInfo.GetMethodAddress (Token);
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			throw new InvalidOperationException ();
 		}

diff --git a/languages/mono/MonoGenericInstanceType.cs b/languages/mono/MonoGenericInstanceType.cs
@@ -70,7 +70,7 @@ public override TargetFieldInfo[] Fields {
 			}
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			Console.WriteLine ("GENERIC INST GET OBJECT: {0}", this);
 			return new MonoClassObject (this, location);

diff --git a/languages/mono/MonoGenericParameterType.cs b/languages/mono/MonoGenericParameterType.cs
@@ -46,7 +46,7 @@ public int Position {
 			get { return pos; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			throw new NotImplementedException ();
 		}

diff --git a/languages/mono/MonoObjectType.cs b/languages/mono/MonoObjectType.cs
@@ -24,7 +24,7 @@ public override TargetClassType ClassType {
 			get { return class_type; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new MonoObjectObject (this, location);
 		}

diff --git a/languages/mono/MonoOpaqueType.cs b/languages/mono/MonoOpaqueType.cs
@@ -33,7 +33,7 @@ public override int Size {
 			get { return 0; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			throw new TargetException (TargetError.LocationInvalid,
 						   "Cannot access variables of type `{0}'", Name);

diff --git a/languages/mono/MonoPointerType.cs b/languages/mono/MonoPointerType.cs
@@ -29,7 +29,7 @@ public override TargetType StaticType {
 			get { return element_type; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new MonoPointerObject (this, location);
 		}

diff --git a/languages/mono/MonoStringType.cs b/languages/mono/MonoStringType.cs
@@ -57,7 +57,7 @@ internal override TargetFundamentalObject CreateInstance (Thread target, object
                         return new MonoStringObject (this, location);
                 }
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new MonoStringObject (this, location);
 		}

diff --git a/languages/mono/MonoVariableLocation.cs b/languages/mono/MonoVariableLocation.cs
@@ -51,11 +51,11 @@ void update (Thread target)
 			is_valid = true;
 		}
 
-		public override bool HasAddress {
+		internal override bool HasAddress {
 			get { return is_regoffset || is_byref; }
 		}
 
-		public override TargetAddress GetAddress (TargetMemoryAccess target)
+		internal override TargetAddress GetAddress (TargetMemoryAccess target)
 		{
 			if (!is_valid)
 				throw new LocationInvalidException ();

diff --git a/languages/native/NativeArrayType.cs b/languages/native/NativeArrayType.cs
@@ -33,7 +33,7 @@ public override bool HasFixedSize {
 			get { return true; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new NativeArrayObject (this, location, lower_bound, upper_bound);
 		}

diff --git a/languages/native/NativeFunctionType.cs b/languages/native/NativeFunctionType.cs
@@ -94,7 +94,7 @@ public override TargetClassType DeclaringType {
 			}
 		}
 
-	        internal override TargetObject GetObject (TargetLocation location)
+	        protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			throw new NotSupportedException ();
 		}

diff --git a/languages/native/NativeOpaqueType.cs b/languages/native/NativeOpaqueType.cs
@@ -32,7 +32,7 @@ public override bool IsByRef {
 			}
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new NativeOpaqueObject (this, location);
 		}

diff --git a/languages/native/NativePointerType.cs b/languages/native/NativePointerType.cs
@@ -38,7 +38,7 @@ public override TargetType StaticType {
 			}
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new NativePointerObject (this, location);
 		}

diff --git a/languages/native/NativeStringType.cs b/languages/native/NativeStringType.cs
@@ -26,7 +26,7 @@ public static int MaximumStringLength {
 			}
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new NativeStringObject (this, location);
 		}

diff --git a/languages/native/NativeStructType.cs b/languages/native/NativeStructType.cs
@@ -200,7 +200,7 @@ public override TargetMethodInfo[] StaticConstructors {
 			}
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			return new NativeStructObject (this, location);
 		}

diff --git a/languages/native/NativeTypeAlias.cs b/languages/native/NativeTypeAlias.cs
@@ -55,7 +55,7 @@ public TargetType TargetType {
 			set { target_type = value; }
 		}
 
-		internal override TargetObject GetObject (TargetLocation location)
+		protected override TargetObject DoGetObject (TargetLocation location)
 		{
 			if (target_type == null)
 				target_type = language.LookupType (target_name);