Browse Source

Values have no names. Names will be part of higher level abstraction.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2775 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 18 years ago
parent
commit
890bd0daae
  1. 1
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs
  2. 5
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs
  3. 1
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs
  4. 1
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs
  5. 10
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.cs
  6. 11
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs
  7. 2
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs
  8. 10
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs

1
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs

@ -37,7 +37,6 @@ namespace Debugger @@ -37,7 +37,6 @@ namespace Debugger
corValue = thread.CorThread.CurrentException;
exceptionType = thread.CurrentExceptionType;
Value runtimeValue = new Value(process,
string.Empty,
delegate { return corValue; } );
message = runtimeValue.GetMember("_message").AsString;

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

@ -437,7 +437,6 @@ namespace Debugger @@ -437,7 +437,6 @@ namespace Debugger
if (thisValueCache == null) {
thisValueCache = new Value(
process,
"this",
delegate { return ThisCorValue; }
);
}
@ -500,11 +499,8 @@ namespace Debugger @@ -500,11 +499,8 @@ namespace Debugger
/// <param name="index"> Zero-based index </param>
public Value GetArgument(int index)
{
string name = GetParameterName(index);
return new Value(
process,
name,
delegate { return GetArgumentCorValue(index); }
);
}
@ -593,7 +589,6 @@ namespace Debugger @@ -593,7 +589,6 @@ namespace Debugger
{
return new Value(
process,
symVar.Name,
delegate { return GetCorValueOfLocalVariable(symVar); }
);
}

1
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

@ -166,7 +166,6 @@ namespace Debugger @@ -166,7 +166,6 @@ namespace Debugger
return new Value(
process,
string.Empty,
delegate { return CorThread.Object;}
);
}

1
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs

@ -233,7 +233,6 @@ namespace Debugger @@ -233,7 +233,6 @@ namespace Debugger
state = EvalState.EvaluatedException;
}
result = new Value(process,
string.Empty,
delegate { return corEval.Result; });
}
}

10
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Expressions/Expression.cs

@ -64,6 +64,16 @@ namespace Debugger @@ -64,6 +64,16 @@ namespace Debugger
return this.Code;
}
static string GetNameFromIndices(uint[] indices)
{
string elementName = "[";
for (int i = 0; i < indices.Length; i++) {
elementName += indices[i].ToString() + ",";
}
elementName = elementName.TrimEnd(new char[] {','}) + "]";
return elementName;
}
Expression GetExpressionFromIndices(uint[] indices)
{
List<Ast.Expression> indicesAst = new List<Ast.Expression>();

11
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Array.cs

@ -76,21 +76,10 @@ namespace Debugger @@ -76,21 +76,10 @@ namespace Debugger
return new Value(
Process,
GetNameFromIndices(indices),
delegate { return GetCorValueOfArrayElement(indices); }
);
}
static string GetNameFromIndices(uint[] indices)
{
string elementName = "[";
for (int i = 0; i < indices.Length; i++) {
elementName += indices[i].ToString() + ",";
}
elementName = elementName.TrimEnd(new char[] {','}) + "]";
return elementName;
}
// May be called later
ICorDebugValue GetCorValueOfArrayElement(uint[] indices)
{

2
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.Object.cs

@ -49,7 +49,6 @@ namespace Debugger @@ -49,7 +49,6 @@ namespace Debugger
{
return new Value(
objectInstance.Process,
fieldInfo.Name,
delegate { return GetFieldCorValue(objectInstance, fieldInfo); }
);
}
@ -111,7 +110,6 @@ namespace Debugger @@ -111,7 +110,6 @@ namespace Debugger
return new Value(
objectInstance.Process,
propertyInfo.Name,
delegate { return Value.InvokeMethod(objectInstance, propertyInfo.GetMethod, arguments).RawCorValue; }
);
}

10
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Values/Value.cs

@ -36,7 +36,6 @@ namespace Debugger @@ -36,7 +36,6 @@ namespace Debugger
/// </remarks>
public partial class Value: DebuggerObject, IExpirable
{
string name;
Process process;
CorValueGetter corValueGetter;
@ -89,13 +88,6 @@ namespace Debugger @@ -89,13 +88,6 @@ namespace Debugger
}
}
/// <summary> Gets the name associated with the value </summary>
public string Name {
get {
return name;
}
}
/// <summary> Returns true if the value is null </summary>
public bool IsNull {
get {
@ -166,11 +158,9 @@ namespace Debugger @@ -166,11 +158,9 @@ namespace Debugger
}
internal Value(Process process,
string name,
CorValueGetter corValueGetter)
{
this.process = process;
this.name = name;
this.corValueGetter = corValueGetter;
// TODO: clean up

Loading…
Cancel
Save