Navigation Menu

Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Commit

Permalink
Fix the MonoVS build.
Browse files Browse the repository at this point in the history 
2009-09-22  Martin Baulig  <martin@ximian.com>

	* frontend/ScriptingContext.cs: Some more `TargetClassType' ->
	`TargetStructType'.

	* frontend/Expression.cs: Likewise.

svn path=/trunk/debugger/; revision=142370
  • Loading branch information
Martin Baulig committed Sep 22, 2009
1 parent fdd8687 commit 3a573d8
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 27 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
View file
@@ -1,3 +1,10 @@
2009-09-22 Martin Baulig <martin@ximian.com>

* frontend/ScriptingContext.cs: Some more `TargetClassType' ->
`TargetStructType'.

* frontend/Expression.cs: Likewise.

2009-09-17 Martin Baulig <martin@ximian.com>

* languages/TargetClassType.cs: Renamed `TargetClassType' into
Expand Down
6 changes: 3 additions & 3 deletions classes/ExpressionEvaluator.cs
View file
Expand Up @@ -84,14 +84,14 @@ public abstract class AsyncResult : IAsyncResult

public delegate void EvaluationCallback (EvaluationResult result, object data);

public static EvaluationResult MonoObjectToString (Thread thread, TargetClassObject obj,
public static EvaluationResult MonoObjectToString (Thread thread, TargetStructObject obj,
EvaluationFlags flags, int timeout,
out string result)
{
result = null;

again:
TargetClassType ctype = obj.Type;
TargetStructType ctype = obj.Type;
if ((ctype.Name == "System.Object") || (ctype.Name == "System.ValueType"))
return EvaluationResult.MethodNotFound;

Expand Down Expand Up @@ -158,7 +158,7 @@ public abstract class AsyncResult : IAsyncResult
}

public static EvaluationResult GetProperty (Thread thread, TargetPropertyInfo property,
TargetClassObject instance, EvaluationFlags flags,
TargetStructObject instance, EvaluationFlags flags,
int timeout, out string error, out TargetObject result)
{
error = null;
Expand Down
4 changes: 2 additions & 2 deletions classes/GUIManager.cs
View file
Expand Up @@ -85,15 +85,15 @@ public void StepOut (Thread thread)
}


public EE.EvaluationResult MonoObjectToString (Thread thread, TargetClassObject obj,
public EE.EvaluationResult MonoObjectToString (Thread thread, TargetStructObject obj,
EE.EvaluationFlags flags, int timeout,
out string text)
{
return EE.MonoObjectToString (thread, obj, flags, timeout, out text);
}

public EE.EvaluationResult GetProperty (Thread thread, TargetPropertyInfo property,
TargetClassObject instance, EE.EvaluationFlags flags,
TargetStructObject instance, EE.EvaluationFlags flags,
int timeout, out string error, out TargetObject value)
{
return EE.GetProperty (thread, property, instance, flags, timeout, out error, out value);
Expand Down
32 changes: 16 additions & 16 deletions frontend/Expression.cs
View file
Expand Up @@ -1108,7 +1108,7 @@ protected override Expression DoResolveType (ScriptingContext context)

public abstract class MemberExpression : Expression
{
public abstract TargetClassObject InstanceObject {
public abstract TargetStructObject InstanceObject {
get;
}

Expand Down Expand Up @@ -1150,13 +1150,13 @@ public SourceLocation EvaluateSource (ScriptingContext context)

public class MethodGroupExpression : MethodExpression
{
protected readonly TargetClassType stype;
protected readonly TargetClassObject instance;
protected readonly TargetStructType stype;
protected readonly TargetStructObject instance;
protected readonly string name;
protected readonly TargetFunctionType[] methods;
protected readonly bool is_instance, is_static;

public MethodGroupExpression (TargetClassType stype, TargetClassObject instance,
public MethodGroupExpression (TargetStructType stype, TargetStructObject instance,
string name, TargetFunctionType[] methods,
bool is_instance, bool is_static)
{
Expand All @@ -1173,7 +1173,7 @@ public class MethodGroupExpression : MethodExpression
get { return stype.Name + "." + name; }
}

public override TargetClassObject InstanceObject {
public override TargetStructObject InstanceObject {
get { return instance; }
}

Expand Down Expand Up @@ -1555,13 +1555,13 @@ protected override bool DoAssign (ScriptingContext context, TargetObject tobj)

public class StructAccessExpression : MemberExpression
{
public readonly TargetClassType Type;
public readonly TargetStructType Type;
public readonly TargetMemberInfo Member;
protected readonly TargetClassObject instance;
protected readonly TargetStructObject instance;
TargetClass class_info;

public StructAccessExpression (TargetClassType type,
TargetClassObject instance,
public StructAccessExpression (TargetStructType type,
TargetStructObject instance,
TargetMemberInfo member)
{
this.Type = type;
Expand All @@ -1574,7 +1574,7 @@ public class StructAccessExpression : MemberExpression
get { return Type.Name + "." + Member.Name; }
}

public override TargetClassObject InstanceObject {
public override TargetStructObject InstanceObject {
get { return instance; }
}

Expand Down Expand Up @@ -1691,8 +1691,8 @@ protected TargetObject GetField (Thread target, TargetFieldInfo field)
Name, member.GetType ());
}

public static MemberExpression FindMember (Thread target, TargetClassType stype,
TargetClassObject instance, string name,
public static MemberExpression FindMember (Thread target, TargetStructType stype,
TargetStructObject instance, string name,
bool search_static, bool search_instance)
{
again:
Expand Down Expand Up @@ -2929,7 +2929,7 @@ public InvocationExpression (Expression expr, Expression[] arguments)
return mg;
}

public override TargetClassObject InstanceObject {
public override TargetStructObject InstanceObject {
get { return method_expr.InstanceObject; }
}

Expand Down Expand Up @@ -3030,7 +3030,7 @@ protected TargetObject DoInvoke (ScriptingContext context, bool debug)
context, args [i], sig.ParameterTypes [i]);
}

TargetClassObject instance = method_expr.InstanceObject;
TargetStructObject instance = method_expr.InstanceObject;

if (!method.IsStatic && !method.IsConstructor && (instance == null))
throw new ScriptingException (
Expand Down Expand Up @@ -3233,9 +3233,9 @@ protected override TargetObject DoEvaluateObject (ScriptingContext context)
internal class TypeProxyExpression : Expression
{
string proxy_type;
TargetClassObject instance;
TargetStructObject instance;

public TypeProxyExpression (string proxy_type, TargetClassObject instance)
public TypeProxyExpression (string proxy_type, TargetStructObject instance)
{
this.proxy_type = proxy_type;
this.instance = instance;
Expand Down
12 changes: 6 additions & 6 deletions frontend/ScriptingContext.cs
View file
Expand Up @@ -230,7 +230,7 @@ public string[] GetNamespaces ()
}
}

public TargetClassObject ImplicitInstance {
public TargetStructObject ImplicitInstance {
get; private set;
}

Expand Down Expand Up @@ -264,7 +264,7 @@ public Expression ParseExpression (string text)

public RuntimeInvokeResult RuntimeInvoke (Thread thread,
TargetFunctionType function,
TargetClassObject object_argument,
TargetStructObject object_argument,
TargetObject[] param_objects,
RuntimeInvokeFlags flags)
{
Expand All @@ -289,7 +289,7 @@ public Expression ParseExpression (string text)
return result;
}

EE.EvaluationResult HandleDebuggerDisplay (Thread thread, TargetClassObject instance,
EE.EvaluationResult HandleDebuggerDisplay (Thread thread, TargetStructObject instance,
string attr_value, int timeout,
out string result)
{
Expand Down Expand Up @@ -389,7 +389,7 @@ public Expression ParseExpression (string text)

public static EE.EvaluationResult HandleDebuggerDisplay (Interpreter interpreter,
Thread thread,
TargetClassObject instance,
TargetStructObject instance,
DebuggerDisplayAttribute attr,
int timeout, out string name,
out string type)
Expand Down Expand Up @@ -443,7 +443,7 @@ string MonoObjectToString (TargetClassObject obj)
return null;
}

TargetClassObject CheckTypeProxy (TargetClassObject obj)
TargetClassObject CheckTypeProxy (TargetStructObject obj)
{
if (obj.Type.DebuggerTypeProxyAttribute == null)
return null;
Expand All @@ -467,7 +467,7 @@ TargetClassObject CheckTypeProxy (TargetClassObject obj)
}

public static TargetClassObject CheckTypeProxy (Interpreter interpreter, Thread thread,
TargetClassObject obj)
TargetStructObject obj)
{
if (obj.Type.DebuggerTypeProxyAttribute == null)
return null;
Expand Down

0 comments on commit 3a573d8

Please sign in to comment.