2006-06-12 Martin Baulig <martin@ximian.com>

	* classes/TargetVariable.cs
	(TargetVariable.IsInScope): New public abstract method.

	* classes/Method.cs
	(Method.GetVariableByName): Added `TargetAddress address' argument
	and check whether the variable is actually in scope.

	* classes/StackFrame.cs
	(StackFrame.Locals): Use `local.IsInScope()' rather than
	`local.IsAlive()'.	


svn path=/trunk/debugger/; revision=61626

ChangeLog

@@ -1,3 +1,16 @@
+2006-06-12  Martin Baulig  <martin@ximian.com>
+
+	* classes/TargetVariable.cs
+	(TargetVariable.IsInScope): New public abstract method.
+
+	* classes/Method.cs
+	(Method.GetVariableByName): Added `TargetAddress address' argument
+	and check whether the variable is actually in scope.
+
+	* classes/StackFrame.cs
+	(StackFrame.Locals): Use `local.IsInScope()' rather than
+	`local.IsAlive()'.	
+
 2006-06-12  Martin Baulig  <martin@ximian.com>
 
 	* backends/SingleSteppingEngine.cs

arch/DwarfReader.cs

@@ -2670,6 +2670,11 @@ protected DwarfTargetVariable (DieSubprogram subprog, string name, TargetType ty
 				get { return type; }
 			}
 
+			public override bool IsInScope (TargetAddress address)
+			{
+				return true;
+			}
+
 			public override bool IsAlive (TargetAddress address)
 			{
 				return true;

classes/Method.cs

@@ -273,10 +273,10 @@ public static bool IsInSameMethod (Method method, TargetAddress address)
 		internal abstract SourceMethod GetTrampoline (TargetMemoryAccess memory,
 							      TargetAddress address);
 
-		public TargetVariable GetVariableByName (string name)
+		public TargetVariable GetVariableByName (TargetAddress address, string name)
 		{
 			foreach (TargetVariable var in Locals) {
-				if (var.Name == name)
+				if ((var.Name == name) && var.IsInScope (address))
 					return var;
 			}
 

classes/StackFrame.cs

@@ -283,7 +283,7 @@ internal void SetLevel (int new_level)
 			get {
 				ArrayList list = new ArrayList ();
 				foreach (TargetVariable local in Method.Locals) {
-					if (local.IsAlive (TargetAddress))
+					if (local.IsInScope (TargetAddress))
 						list.Add (local);
 				}
 				TargetVariable[] retval = new TargetVariable [list.Count];

frontend/Expression.cs

@@ -746,7 +746,8 @@ protected override Expression DoResolve (ScriptingContext context)
 		{
 			StackFrame frame = context.CurrentFrame;
 			if (frame.Method != null) {
-				TargetVariable var = frame.Method.GetVariableByName (name);
+				TargetVariable var = frame.Method.GetVariableByName (
+					frame.TargetAddress, name);
 				if (var != null)
 					return new VariableAccessExpression (var);
 			}

languages/TargetVariable.cs

@@ -15,6 +15,12 @@ public abstract class TargetVariable : DebuggerMarshalByRefObject
 			get;
 		}
 
+		// <summary>
+		//   Checks whether the variable is accessible in the lexical scope around
+		//   address @address, but without actually trying to access the variable.
+		// </summary>
+		public abstract bool IsInScope (TargetAddress address);
+
 		// <summary>
 		//   Checks whether the variable is alive at @address, but without actually
 		//   trying to access the variable.  The implementation just checks the data

languages/mono/MonoVariable.cs

@@ -52,6 +52,9 @@ internal class MonoVariable : TargetVariable
 			this.info = info;
 			this.is_byref = is_byref;
 
+			start_scope = method.StartAddress;
+			end_scope = method.EndAddress;
+
 			if (info.HasLivenessInfo) {
 				start_liveness = method.StartAddress + info.BeginLiveness;
 				end_liveness = method.StartAddress + info.EndLiveness;
@@ -92,6 +95,11 @@ public TargetLocation GetLocation (StackFrame frame)
 				return null;
 		}
 
+		public override bool IsInScope (TargetAddress address)
+		{
+			return (address >= start_scope) && (address <= end_scope);
+		}
+
 		public override bool IsAlive (TargetAddress address)
 		{
 			return (address >= start_liveness) && (address <= end_liveness);