Author: martin
Date: 2006-11-28 09:12:53 -0500 (Tue, 28 Nov 2006)
New Revision: 68581
Modified:
branches/martin/anonymous-methods2/mcs/anonymous.cs
branches/martin/anonymous-methods2/mcs/expression.cs
Log:
Modified: branches/martin/anonymous-methods2/mcs/anonymous.cs
===================================================================
--- branches/martin/anonymous-methods2/mcs/anonymous.cs 2006-11-28 13:23:34 UTC
(rev 68580)
+++ branches/martin/anonymous-methods2/mcs/anonymous.cs 2006-11-28 14:12:53 UTC
(rev 68581)
@@ -229,6 +229,7 @@
Hashtable locals = new Hashtable ();
Hashtable captured_scopes = new Hashtable ();
+ Hashtable captured_params;
protected CapturedScope[] CapturedScopes {
get {
@@ -361,6 +362,40 @@
return (Variable) locals [local];
}
+ public bool HostsParameters {
+ get { return captured_params != null; }
+ }
+
+ public Variable GetCapturedParameter (Parameter par)
+ {
+ if (captured_params != null)
+ return (Variable) captured_params [par];
+ else
+ return null;
+ }
+
+ public bool IsParameterCaptured (string name)
+ {
+ if (captured_params != null)
+ return captured_params [name] != null;
+ return false;
+ }
+
+ public Variable AddParameter (Parameter par, int idx)
+ {
+ if (captured_params == null)
+ captured_params = new Hashtable ();
+
+ Variable var = (Variable) captured_params [par];
+ if (var == null) {
+ var = new CapturedParameter (this, par, idx);
+ captured_params.Add (par, var);
+ par.IsCaptured = true;
+ }
+
+ return var;
+ }
+
protected string MakeFieldName (string local_name)
{
return "<" + ID + ":" + local_name + ">";
@@ -599,6 +634,18 @@
local.FieldInstance = fe;
}
+ if (Scope.HostsParameters) {
+ foreach (CapturedParameter cp in
Scope.captured_params.Values) {
+ FieldExpr fe = (FieldExpr)
Expression.MemberLookup (
+ ec.ContainerType, type,
cp.Field.Name, loc);
+ if (fe == null)
+ throw new
InternalErrorException ();
+
+ fe.InstanceExpression = this;
+ cp.FieldInstance = fe;
+ }
+ }
+
foreach (CapturedScope scope in
Scope.CapturedScopes) {
FieldExpr fe = (FieldExpr)
Expression.MemberLookup (
ec.ContainerType, type,
scope.Field.Name, loc);
@@ -618,7 +665,7 @@
protected virtual void EmitParameterReference
(EmitContext ec,
CapturedParameter cp)
{
- int extra = ec.IsStatic ? 0 : 1;
+ int extra = ec.MethodIsStatic ? 0 : 1;
ParameterReference.EmitLdArg (ec.ig, cp.Idx +
extra);
}
@@ -687,6 +734,16 @@
else
captured_scope.EmitAssign (ec);
+ if (Scope.HostsParameters) {
+ foreach (CapturedParameter cp in
Scope.captured_params.Values) {
+ Report.Debug (128, "EMIT SCOPE
INIT #6", this,
+ ec, ec.IsStatic,
Scope, cp, cp.Field.Name);
+ DoEmitInstance (ec);
+ EmitParameterReference (ec, cp);
+ ec.ig.Emit (OpCodes.Stfld,
cp.FieldInstance.FieldInfo);
+ }
+ }
+
if (Scope.RootScope.IsIterator)
return;
@@ -719,7 +776,6 @@
TypeExpr parent_type;
CapturedVariableField parent_link;
CapturedThis this_variable;
- Hashtable captured_params;
protected ArrayList scopes;
public virtual bool IsIterator {
@@ -742,10 +798,6 @@
get { return this_variable; }
}
- public bool HostsParameters {
- get { return captured_params != null; }
- }
-
public Variable CaptureThis ()
{
if (ParentHost != null)
@@ -757,36 +809,6 @@
return this_variable;
}
- public Variable GetCapturedParameter (Parameter par)
- {
- if (captured_params != null)
- return (Variable) captured_params [par];
- else
- return null;
- }
-
- public bool IsParameterCaptured (string name)
- {
- if (captured_params != null)
- return captured_params [name] != null;
- return false;
- }
-
- public Variable AddParameter (Parameter par, int idx)
- {
- if (captured_params == null)
- captured_params = new Hashtable ();
-
- Variable var = (Variable) captured_params [par];
- if (var == null) {
- var = new CapturedParameter (this, par, idx);
- captured_params.Add (par, var);
- par.IsCaptured = true;
- }
-
- return var;
- }
-
public void AddScope (ScopeInfo scope)
{
scopes.Add (scope);
@@ -863,6 +885,7 @@
pfield.MemberType, "parent",
Parameter.Modifier.NONE,
null, Location));
+#if FIXME
if (HostsParameters) {
foreach (CapturedParameter cp in
captured_params.Values) {
args.Add (new Parameter (
@@ -870,6 +893,7 @@
Parameter.Modifier.NONE, null, Location));
}
}
+#endif
Parameter[] ctor_params = new Parameter [args.Count];
args.CopyTo (ctor_params, 0);
@@ -903,6 +927,7 @@
pos++;
}
+#if FIXME
if (HostsParameters) {
foreach (CapturedParameter cp in
captured_params.Values) {
ec.ig.Emit (OpCodes.Ldarg_0);
@@ -910,6 +935,7 @@
ec.ig.Emit (OpCodes.Stfld,
cp.Field.FieldBuilder);
}
}
+#endif
}
protected class TheCtor : Statement
@@ -961,6 +987,7 @@
Host.THIS.FieldInstance = fe;
}
+#if FIXME
//
// Copy the parameter values, if any
//
@@ -975,6 +1002,7 @@
cp.FieldInstance = fe;
}
}
+#endif
return base.DoResolveInternal (ec);
}
@@ -994,11 +1022,13 @@
} else if (host.ParentLink != null)
ec.ig.Emit (OpCodes.Ldarg_0);
+#if FIXME
if (Host.HostsParameters) {
foreach (CapturedParameter cp in
Host.captured_params.Values) {
EmitParameterReference (ec, cp);
}
}
+#endif
base.EmitScopeConstructor (ec);
}
@@ -1430,7 +1460,8 @@
protected class AnonymousMethodMethod : Method
{
- public AnonymousContainer AnonymousMethod;
+ public readonly AnonymousContainer AnonymousMethod;
+ public readonly ScopeInfo Scope;
public AnonymousMethodMethod (AnonymousContainer am,
ScopeInfo scope,
GenericMethod generic,
TypeExpr return_type,
@@ -1439,6 +1470,7 @@
generic, return_type, mod, false, name,
parameters, null)
{
this.AnonymousMethod = am;
+ this.Scope = scope;
if (scope != null) {
scope.CheckMembersDefined ();
@@ -1454,6 +1486,7 @@
{
EmitContext aec = AnonymousMethod.aec;
aec.ig = ig;
+ aec.MethodIsStatic = Scope == null;
return aec;
}
}
@@ -1563,6 +1596,10 @@
member_name = new MemberName (name, args,
Location);
+ Report.Debug (128, "CREATE METHOD HOST #5",
this, DelegateType,
+ TypeManager.GetTypeArguments
(DelegateType),
+ dt, tparam, args);
+
generic_method = new GenericMethod (
Host.NamespaceEntry, scope, member_name,
new TypeExpression (ReturnType,
Location), Parameters);
Modified: branches/martin/anonymous-methods2/mcs/expression.cs
===================================================================
--- branches/martin/anonymous-methods2/mcs/expression.cs 2006-11-28
13:23:34 UTC (rev 68580)
+++ branches/martin/anonymous-methods2/mcs/expression.cs 2006-11-28
14:12:53 UTC (rev 68581)
@@ -3723,15 +3723,14 @@
RootScopeInfo host = null;
ToplevelBlock toplevel = block.Toplevel;
while (toplevel != null) {
- if (toplevel.IsLocalParameter (name)) {
- host = toplevel.RootScope;
+ if (toplevel.IsLocalParameter (name))
break;
- }
toplevel = toplevel.Container;
}
- variable = host.AddParameter (par, idx);
+ ScopeInfo scope = toplevel.CreateScopeInfo ();
+ variable = scope.AddParameter (par, idx);
type = variable.Type;
return true;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
