Browse Source

Used constructor instead of Variable.CreateVariable

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@828 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 20 years ago
parent
commit
0a0a63d6e9
  1. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
  2. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ArrayValue.cs
  3. 6
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs
  4. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs
  5. 20
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variable.cs

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs

@ -456,7 +456,7 @@ namespace Debugger @@ -456,7 +456,7 @@ namespace Debugger
public Variable GetArgumentVariable(int index)
{
return Variable.CreateVariable(debugger, GetArgumentValue(index), GetParameterName(index));
return new Variable(debugger, GetArgumentValue(index), GetParameterName(index));
}
public IEnumerable<Variable> ArgumentVariables {
@ -517,7 +517,7 @@ namespace Debugger @@ -517,7 +517,7 @@ namespace Debugger
{
ICorDebugValue runtimeVar;
CorILFrame.GetLocalVariable((uint)symVar.AddressField1, out runtimeVar);
return Variable.CreateVariable(debugger, runtimeVar, symVar.Name);
return new Variable(debugger, runtimeVar, symVar.Name);
}
}
}

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ArrayValue.cs

@ -102,7 +102,7 @@ namespace Debugger @@ -102,7 +102,7 @@ namespace Debugger
fixed (void* pIndices = indices)
corArrayValue.GetElement(rank, new IntPtr(pIndices), out element);
return Variable.CreateVariable(debugger, element, elementName);
return new Variable(debugger, element, elementName);
}
}

6
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectValue.cs

@ -148,9 +148,9 @@ namespace Debugger @@ -148,9 +148,9 @@ namespace Debugger
((ICorDebugObjectValue)corValue).GetFieldValue(corClass, field.Token, out fieldValue);
}
var = Variable.CreateVariable(debugger, fieldValue, field.Name);
var = new Variable(debugger, fieldValue, field.Name);
} catch {
var = Variable.CreateVariable(new UnavailableValue(debugger), field.Name);
var = new Variable(new UnavailableValue(debugger), field.Name);
}
yield return var;
}
@ -160,7 +160,7 @@ namespace Debugger @@ -160,7 +160,7 @@ namespace Debugger
public Variable BaseClassVariable {
get {
if (HasBaseClass) {
return Variable.CreateVariable(this.BaseClass, "<Base class>");
return new Variable(this.BaseClass, "<Base class>");
} else {
return null;
}

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs

@ -17,7 +17,7 @@ namespace Debugger @@ -17,7 +17,7 @@ namespace Debugger
public event EventHandler<DebuggerEventArgs> ValueEvaluated;
internal PropertyVariable(Eval eval, string name):base(eval.Debugger, new UnavailableValue(eval.Debugger), name)
internal PropertyVariable(Eval eval, string name):base(new UnavailableValue(eval.Debugger), name)
{
this.Eval = eval;
}

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

@ -97,24 +97,18 @@ namespace Debugger @@ -97,24 +97,18 @@ namespace Debugger
}
}
public Variable(NDebugger debugger, Value val, string name)
public Variable(NDebugger debugger, ICorDebugValue corValue, string name):this(Value.CreateValue(debugger, corValue), name)
{
this.debugger = debugger;
}
public Variable(Value val, string name)
{
this.debugger = val.Debugger;
this.Value = val;
this.name = name;
this.subVariables = new VariableCollection(debugger);
this.subVariables.Updating += OnSubVariablesUpdating;
}
internal static Variable CreateVariable(NDebugger debugger, ICorDebugValue corValue, string name)
{
Value val = Value.CreateValue(debugger, corValue);
return CreateVariable(val, name);
}
public static Variable CreateVariable(Value val, string name)
{
return new Variable(val.Debugger, val, name);
}
}
}

Loading…
Cancel
Save