diff options
| author | Lluis Sanchez <lluis@novell.com> | 2009-12-11 21:07:58 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2009-12-11 21:07:58 +0300 |
| commit | 5f05393355d367f2d1fcec308a030ed54ef7fc9e (patch) | |
| tree | 89d10b9dd697ec5f128190cb0bab68362dc5e84f /extras/MonoDevelop.Debugger.Mdb | |
| parent | a740929020b0a92d689030c08c07d689ba7a6e88 (diff) | |
* Mono.Debugging.Server.Mdb/DebuggerServer.cs:
* Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs: Track api
changes.
svn path=/trunk/monodevelop/; revision=148113
Diffstat (limited to 'extras/MonoDevelop.Debugger.Mdb')
3 files changed, 10 insertions, 5 deletions
diff --git a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog index a283fc4c5c..966b0f23ca 100644 --- a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog +++ b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/ChangeLog @@ -1,3 +1,8 @@ +2009-12-11 Lluis Sanchez Gual <lluis@novell.com> + + * DebuggerServer.cs: + * MdbObjectValueAdaptor.cs: Track api changes. + 2009-12-03 Lluis Sanchez Gual <lluis@novell.com> * MdbObjectValueAdaptor.cs: Track api changes. diff --git a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs index 2ac6f957ae..86069d8c97 100644 --- a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs +++ b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs @@ -319,7 +319,7 @@ namespace DebuggerServer MdbEvaluationContext ctx = new MdbEvaluationContext (activeThread, activeThread.CurrentFrame, SessionOptions.EvaluationOptions); ML.TargetObject ob = EvaluateExp (ctx, bp.ConditionExpression); if (ob != null) - lastConditionValue [ev.Index] = evaluator.TargetObjectToExpression (ctx, ob); + lastConditionValue [ev.Index] = evaluator.TargetObjectToExpression (ctx, ob).Value; } events [ev.Index] = be; @@ -377,7 +377,7 @@ namespace DebuggerServer if (val == null) return false; if (bp.BreakIfConditionChanges) { - string current = evaluator.TargetObjectToExpression (ctx, val); + string current = evaluator.TargetObjectToExpression (ctx, val).Value; string last; bool found = lastConditionValue.TryGetValue (eventHandle, out last); lastConditionValue [eventHandle] = current; diff --git a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs index fa2a00a11c..0e590482ad 100644 --- a/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs +++ b/extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs @@ -525,7 +525,7 @@ namespace DebuggerServer TargetObject obj = ctx.GetRealObject (vobj); if (obj == null) - return ObjectValue.CreateObject (null, path, "", null, flags | ObjectValueFlags.ReadOnly, null); + return ObjectValue.CreateObject (null, path, "", "", flags | ObjectValueFlags.ReadOnly, null); if (obj.HasAddress && obj.GetAddress (ctx.Thread).IsNull) return ObjectValue.CreateObject (null, path, obj.TypeName, ctx.Evaluator.ToExpression (null), flags, null); @@ -541,9 +541,9 @@ namespace DebuggerServer if (co == null) return ObjectValue.CreateUnknown (path.LastName); else { - string tvalue; + EvaluationResult tvalue; if (!string.IsNullOrEmpty (tdata.ValueDisplayString) && ctx.Options.AllowDisplayStringEvaluation) - tvalue = EvaluateDisplayString (ctx, co, tdata.ValueDisplayString); + tvalue = new EvaluationResult (EvaluateDisplayString (ctx, co, tdata.ValueDisplayString)); else tvalue = ctx.Evaluator.TargetObjectToExpression (ctx, obj); |