//
using System;
-using System.Text;
using System.Collections.Generic;
+
+#if STATIC
+using IKVM.Reflection;
+using IKVM.Reflection.Emit;
+#else
using System.Reflection;
using System.Reflection.Emit;
+#endif
namespace Mono.CSharp {
public abstract class CompilerGeneratedClass : Class
{
- public static string MakeName (string host, string typePrefix, string name, int id)
- {
- return "<" + host + ">" + typePrefix + "__" + name + id.ToString ("X");
- }
-
protected CompilerGeneratedClass (DeclSpace parent, MemberName name, Modifiers mod)
: base (parent.NamespaceEntry, parent, name, mod | Modifiers.COMPILER_GENERATED, null)
{
if (HasMembersDefined)
throw new InternalErrorException ("Helper class already defined!");
}
- }
- //
- // Anonymous method storey is created when an anonymous method uses
- // variable or parameter from outer scope. They are then hoisted to
- // anonymous method storey (captured)
- //
- public class AnonymousMethodStorey : CompilerGeneratedClass
- {
- struct StoreyFieldPair
+ protected static MemberName MakeMemberName (MemberBase host, string name, int unique_id, TypeParameter[] tparams, Location loc)
{
- public readonly AnonymousMethodStorey Storey;
- public readonly Field Field;
-
- public StoreyFieldPair (AnonymousMethodStorey storey, Field field)
- {
- this.Storey = storey;
- this.Field = field;
+ string host_name = host == null ? null : host.Name;
+ string tname = MakeName (host_name, "c", name, unique_id);
+ TypeArguments args = null;
+ if (tparams != null) {
+ args = new TypeArguments ();
+ foreach (TypeParameter tparam in tparams)
+ args.Add (new TypeParameterName (tparam.Name, null, loc));
}
+
+ return new MemberName (tname, args, loc);
}
- sealed class HoistedGenericField : Field
+ public static string MakeName (string host, string typePrefix, string name, int id)
+ {
+ return "<" + host + ">" + typePrefix + "__" + name + id.ToString ("X");
+ }
+ }
+
+ public class HoistedStoreyClass : CompilerGeneratedClass
+ {
+ public sealed class HoistedField : Field
{
- public HoistedGenericField (DeclSpace parent, FullNamedExpression type, Modifiers mod, string name,
+ public HoistedField (HoistedStoreyClass parent, FullNamedExpression type, Modifiers mod, string name,
Attributes attrs, Location loc)
: base (parent, type, mod, new MemberName (name, loc), attrs)
{
if (!base.ResolveMemberType ())
return false;
- AnonymousMethodStorey parent = ((AnonymousMethodStorey) Parent).GetGenericStorey ();
+ HoistedStoreyClass parent = ((HoistedStoreyClass) Parent).GetGenericStorey ();
if (parent != null && parent.Mutator != null)
member_type = parent.Mutator.Mutate (MemberType);
}
}
+ protected TypeParameterMutator mutator;
+
+ public HoistedStoreyClass (DeclSpace parent, MemberName name, TypeParameter[] tparams, Modifiers mod)
+ : base (parent, name, mod | Modifiers.PRIVATE)
+ {
+ if (tparams != null) {
+ type_params = new TypeParameter[tparams.Length];
+ var src = new TypeParameterSpec[tparams.Length];
+ var dst = new TypeParameterSpec[tparams.Length];
+
+ for (int i = 0; i < type_params.Length; ++i) {
+ type_params[i] = tparams[i].CreateHoistedCopy (this, spec);
+
+ src[i] = tparams[i].Type;
+ dst[i] = type_params[i].Type;
+ }
+
+ // A copy is not enough, inflate any type parameter constraints
+ // using a new type parameters
+ var inflator = new TypeParameterInflator (null, src, dst);
+ for (int i = 0; i < type_params.Length; ++i) {
+ src[i].InflateConstraints (inflator, dst[i]);
+ }
+ }
+ }
+
+ #region Properties
+
+ public TypeParameterMutator Mutator {
+ get {
+ return mutator;
+ }
+ set {
+ mutator = value;
+ }
+ }
+
+ #endregion
+
+ public HoistedStoreyClass GetGenericStorey ()
+ {
+ DeclSpace storey = this;
+ while (storey != null && storey.CurrentTypeParameters == null)
+ storey = storey.Parent;
+
+ return storey as HoistedStoreyClass;
+ }
+ }
+
+
+ //
+ // Anonymous method storey is created when an anonymous method uses
+ // variable or parameter from outer scope. They are then hoisted to
+ // anonymous method storey (captured)
+ //
+ public class AnonymousMethodStorey : HoistedStoreyClass
+ {
+ struct StoreyFieldPair
+ {
+ public readonly AnonymousMethodStorey Storey;
+ public readonly Field Field;
+
+ public StoreyFieldPair (AnonymousMethodStorey storey, Field field)
+ {
+ this.Storey = storey;
+ this.Field = field;
+ }
+ }
+
//
// Needed to delay hoisted _this_ initialization. When an anonymous
// method is used inside ctor and _this_ is hoisted, base ctor has to
// Local variable which holds this storey instance
public LocalTemporary Instance;
- TypeParameterMutator mutator;
-
- public AnonymousMethodStorey (Block block, TypeContainer parent, MemberBase host, GenericMethod generic, string name)
- : base (parent, MakeMemberName (host, name, generic, block.StartLocation), Modifiers.PRIVATE | Modifiers.SEALED)
+ public AnonymousMethodStorey (Block block, TypeContainer parent, MemberBase host, TypeParameter[] tparams, string name)
+ : base (parent, MakeMemberName (host, name, unique_id, tparams, block.StartLocation),
+ tparams, Modifiers.SEALED)
{
Parent = parent;
OriginalSourceBlock = block;
ID = unique_id++;
-
- if (generic != null) {
- var hoisted_tparams = generic.CurrentTypeParameters;
- type_params = new TypeParameter [hoisted_tparams.Length];
- for (int i = 0; i < type_params.Length; ++i) {
- type_params[i] = hoisted_tparams[i].CreateHoistedCopy (spec);
- }
- }
- }
-
- static MemberName MakeMemberName (MemberBase host, string name, GenericMethod generic, Location loc)
- {
- string host_name = host == null ? null : host.Name;
- string tname = MakeName (host_name, "c", name, unique_id);
- TypeArguments args = null;
- if (generic != null) {
- args = new TypeArguments ();
- foreach (TypeParameter tparam in generic.CurrentTypeParameters)
- args.Add (new TypeParameterName (tparam.Name, null, loc));
- }
-
- return new MemberName (tname, args, loc);
}
public void AddCapturedThisField (EmitContext ec)
return AddCompilerGeneratedField (name, field_type);
const Modifiers mod = Modifiers.INTERNAL | Modifiers.COMPILER_GENERATED;
- Field f = new HoistedGenericField (this, field_type, mod, name, null, Location);
+ Field f = new HoistedField (this, field_type, mod, name, null, Location);
AddField (f);
return f;
}
}
//
- // Creates a link between block and the anonymous method storey
+ // Creates a link between hoisted variable block and the anonymous method storey
//
// An anonymous method can reference variables from any outer block, but they are
// hoisted in their own ExplicitBlock. When more than one block is referenced we
used_parent_storeys.Add (new StoreyFieldPair (storey, f));
}
- public void CaptureLocalVariable (ResolveContext ec, LocalInfo local_info)
+ public void CaptureLocalVariable (ResolveContext ec, LocalVariable local_info)
{
ec.CurrentBlock.Explicit.HasCapturedVariable = true;
if (ec.CurrentBlock.Explicit != local_info.Block.Explicit)
type_params = null;
spec.IsGeneric = false;
spec.DeclaringType = parentStorey.CurrentType;
-// MemberName.TypeArguments = null;
+ MemberName.TypeArguments = null;
}
protected override bool DoResolveTypeParameters ()
}
}
+ //
+ // Update parent cache as we most likely passed the point
+ // where the cache was constructed
+ //
+ Parent.CurrentType.MemberCache.AddMember (this.spec);
+
return true;
}
//
// Initializes all hoisted variables
//
- public void EmitStoreyInstantiation (EmitContext ec)
+ public void EmitStoreyInstantiation (EmitContext ec, ExplicitBlock block)
{
// There can be only one instance variable for each storey type
if (Instance != null)
//
// Create an instance of a storey
//
- Expression storey_type_expr = CreateStoreyTypeExpression (ec);
+ var storey_type_expr = CreateStoreyTypeExpression (ec);
ResolveContext rc = new ResolveContext (ec.MemberContext);
+ rc.CurrentBlock = block;
Expression e = new New (storey_type_expr, null, Location).Resolve (rc);
e.Emit (ec);
Instance = new LocalTemporary (storey_type_expr.Type);
Instance.Store (ec);
- EmitHoistedFieldsInitialization (ec);
+ EmitHoistedFieldsInitialization (rc, ec);
SymbolWriter.DefineScopeVariable (ID, Instance.Builder);
SymbolWriter.CloseCompilerGeneratedBlock (ec);
}
- void EmitHoistedFieldsInitialization (EmitContext ec)
+ void EmitHoistedFieldsInitialization (ResolveContext rc, EmitContext ec)
{
//
// Initialize all storey reference fields by using local or hoisted variables
//
if (used_parent_storeys != null) {
- var rc = new ResolveContext (ec.MemberContext);
-
foreach (StoreyFieldPair sf in used_parent_storeys) {
//
// Get instance expression of storey field
//
if (OriginalSourceBlock.Explicit.HasCapturedThis && !(Parent is AnonymousMethodStorey)) {
AddCapturedThisField (ec);
- OriginalSourceBlock.AddScopeStatement (new ThisInitializer (hoisted_this));
+ rc.CurrentBlock.AddScopeStatement (new ThisInitializer (hoisted_this));
}
//
base.EmitType ();
}
- public AnonymousMethodStorey GetGenericStorey ()
- {
- DeclSpace storey = this;
- while (storey != null && storey.CurrentTypeParameters == null)
- storey = storey.Parent;
-
- return storey as AnonymousMethodStorey;
- }
-
//
// Returns a field which holds referenced storey instance
//
return f_ind;
}
- protected virtual string GetVariableMangledName (LocalInfo local_info)
+ protected virtual string GetVariableMangledName (LocalVariable local_info)
{
//
// No need to mangle anonymous method hoisted variables cause they
get { return hoisted_this; }
}
- public TypeParameterMutator Mutator {
- get {
- return mutator;
- }
- set {
- mutator = value;
- }
- }
-
public IList<ExplicitBlock> ReferencesFromChildrenBlock {
get { return children_references; }
}
public override Expression CreateExpressionTree (ResolveContext ec)
{
- throw new NotSupportedException ("ET");
+ return hv.CreateExpressionTree ();
}
protected override Expression DoResolve (ResolveContext ec)
{
eclass = ExprClass.Value;
- type = TypeManager.expression_type_expr.Type;
+ type = ec.Module.PredefinedTypes.Expression.Resolve (Location);
return this;
}
//
// Creates field access expression for hoisted variable
//
- protected FieldExpr GetFieldExpression (EmitContext ec)
+ protected virtual FieldExpr GetFieldExpression (EmitContext ec)
{
if (ec.CurrentAnonymousMethod == null || ec.CurrentAnonymousMethod.Storey == null) {
if (cached_outer_access != null)
}
if (inner_access == null) {
- if (field.Parent.MemberName.IsGeneric) {
+ if (field.Parent.IsGeneric) {
var fs = MemberCache.GetMember (field.Parent.CurrentType, field.Spec);
inner_access = new FieldExpr (fs, field.Location);
} else {
{
readonly string name;
- public HoistedLocalVariable (AnonymousMethodStorey scope, LocalInfo local, string name)
- : base (scope, name, local.VariableType)
+ public HoistedLocalVariable (AnonymousMethodStorey scope, LocalVariable local, string name)
+ : base (scope, name, local.Type)
{
this.name = local.Name;
}
}
Dictionary<TypeSpec, Expression> compatibles;
- public ToplevelBlock Block;
+ public ParametersBlock Block;
public AnonymousMethodExpression (Location loc)
{
}
}
- protected TypeSpec CompatibleChecks (ResolveContext ec, TypeSpec delegate_type)
+ TypeSpec CompatibleChecks (ResolveContext ec, TypeSpec delegate_type)
{
if (delegate_type.IsDelegate)
return delegate_type;
if (TypeManager.HasElementType (type) && TypeManager.IsGenericParameter (TypeManager.GetElementType (type)))
continue;
- if (invoke_pd.Types [i] != Parameters.Types [i]) {
+ if (!TypeSpecComparer.IsEqual (invoke_pd.Types [i], Parameters.Types [i])) {
if (ignore_errors)
return false;
public TypeSpec InferReturnType (ResolveContext ec, TypeInferenceContext tic, TypeSpec delegate_type)
{
+ Expression expr;
AnonymousExpression am;
+
+ if (compatibles.TryGetValue (delegate_type, out expr)) {
+ am = expr as AnonymousExpression;
+ return am == null ? null : am.ReturnType;
+ }
+
using (ec.Set (ResolveContext.Options.ProbingMode | ResolveContext.Options.InferReturnType)) {
am = CompatibleMethodBody (ec, tic, InternalType.Arglist, delegate_type);
if (am != null)
am = am.Compatible (ec);
}
-
+
if (am == null)
return null;
+// compatibles.Add (delegate_type, am);
return am.ReturnType;
}
} catch (Exception e) {
throw new InternalErrorException (e, loc);
}
-
- if (!ec.IsInProbingMode)
- compatibles.Add (type, am == null ? EmptyExpression.Null : am);
+
+ if (!ec.IsInProbingMode) {
+ compatibles.Add (type, am ?? EmptyExpression.Null);
+ }
return am;
}
for (int i = 0; i < delegate_parameters.Count; i++) {
Parameter.Modifier i_mod = delegate_parameters.FixedParameters [i].ModFlags;
if (i_mod == Parameter.Modifier.OUT) {
- ec.Report.Error (1688, loc, "Cannot convert anonymous " +
- "method block without a parameter list " +
- "to delegate type `{0}' because it has " +
- "one or more `out' parameters.",
- TypeManager.CSharpName (delegate_type));
+ if (!ec.IsInProbingMode) {
+ ec.Report.Error (1688, loc,
+ "Cannot convert anonymous method block without a parameter list to delegate type `{0}' because it has one or more `out' parameters",
+ delegate_type.GetSignatureForError ());
+ }
+
return null;
}
fixedpars[i] = new Parameter (
- null, null,
+ new TypeExpression (delegate_parameters.Types [i], loc), null,
delegate_parameters.FixedParameters [i].ModFlags, null, loc);
}
//
type = InternalType.AnonymousMethod;
- if ((Parameters != null) && !Parameters.Resolve (ec))
+ if (!DoResolveParameters (ec))
return null;
// FIXME: The emitted code isn't very careful about reachability
return this;
}
+ protected virtual bool DoResolveParameters (ResolveContext rc)
+ {
+ return Parameters.Resolve (rc);
+ }
+
public override void Emit (EmitContext ec)
{
// nothing, as we only exist to not do anything.
if (p == null)
return null;
- ToplevelBlock b = ec.IsInProbingMode ? (ToplevelBlock) Block.PerformClone () : Block;
+ ParametersBlock b = ec.IsInProbingMode ? (ParametersBlock) Block.PerformClone () : Block;
return CompatibleMethodFactory (return_type, delegate_type, p, b);
}
- protected virtual AnonymousMethodBody CompatibleMethodFactory (TypeSpec return_type, TypeSpec delegate_type, ParametersCompiled p, ToplevelBlock b)
+ protected virtual AnonymousMethodBody CompatibleMethodFactory (TypeSpec return_type, TypeSpec delegate_type, ParametersCompiled p, ParametersBlock b)
{
return new AnonymousMethodBody (p, b, return_type, delegate_type, loc);
}
{
AnonymousMethodExpression target = (AnonymousMethodExpression) t;
- target.Block = (ToplevelBlock) clonectx.LookupBlock (Block);
+ target.Block = (ParametersBlock) clonectx.LookupBlock (Block);
}
}
this.RealName = real_name;
Parent.PartialContainer.AddMethod (this);
- Block = am.Block;
+ Block = new ToplevelBlock (am.block, parameters);
}
public override EmitContext CreateEmitContext (ILGenerator ig)
}
}
- readonly ToplevelBlock block;
+ protected ParametersBlock block;
public TypeSpec ReturnType;
object return_label;
- protected AnonymousExpression (ToplevelBlock block, TypeSpec return_type, Location loc)
+ protected AnonymousExpression (ParametersBlock block, TypeSpec return_type, Location loc)
{
this.ReturnType = return_type;
this.block = block;
public AnonymousExpression Compatible (ResolveContext ec, AnonymousExpression ae)
{
+ if (block.Resolved)
+ return this;
+
// TODO: Implement clone
- BlockContext aec = new BlockContext (ec.MemberContext, Block, ReturnType);
+ BlockContext aec = new BlockContext (ec, block, ReturnType);
aec.CurrentAnonymousMethod = ae;
- IDisposable aec_dispose = null;
ResolveContext.Options flags = 0;
- if (ec.HasSet (ResolveContext.Options.InferReturnType)) {
- flags |= ResolveContext.Options.InferReturnType;
- aec.ReturnTypeInference = new TypeInferenceContext ();
+
+ var am = this as AnonymousMethodBody;
+
+ if (ec.HasSet (ResolveContext.Options.InferReturnType) && am != null) {
+ am.ReturnTypeInference = new TypeInferenceContext ();
}
if (ec.IsInProbingMode)
if (ec.HasSet (ResolveContext.Options.FieldInitializerScope))
flags |= ResolveContext.Options.FieldInitializerScope;
- if (ec.IsUnsafe)
- flags |= ResolveContext.Options.UnsafeScope;
-
- if (ec.HasSet (ResolveContext.Options.CheckedScope))
- flags |= ResolveContext.Options.CheckedScope;
-
if (ec.HasSet (ResolveContext.Options.ExpressionTreeConversion))
flags |= ResolveContext.Options.ExpressionTreeConversion;
- // HACK: Flag with 0 cannot be set
- if (flags != 0)
- aec_dispose = aec.Set (flags);
+ aec.Set (flags);
+
+ var errors = ec.Report.Errors;
- bool res = Block.Resolve (ec.CurrentBranching, aec, Block.Parameters, null);
+ bool res = Block.Resolve (ec.CurrentBranching, aec, null);
if (aec.HasReturnLabel)
return_label = aec.ReturnLabel;
- if (ec.HasSet (ResolveContext.Options.InferReturnType)) {
- aec.ReturnTypeInference.FixAllTypes (ec);
- ReturnType = aec.ReturnTypeInference.InferredTypeArguments [0];
+ if (am != null && am.ReturnTypeInference != null) {
+ am.ReturnTypeInference.FixAllTypes (ec);
+ ReturnType = am.ReturnTypeInference.InferredTypeArguments [0];
+ am.ReturnTypeInference = null;
}
- if (aec_dispose != null) {
- aec_dispose.Dispose ();
- }
+ if (res && errors != ec.Report.Errors)
+ return null;
return res ? this : null;
}
public void SetHasThisAccess ()
{
- Block.HasCapturedThis = true;
- ExplicitBlock b = Block.Parent.Explicit;
-
- while (b != null) {
+ ExplicitBlock b = block;
+ do {
if (b.HasCapturedThis)
return;
b.HasCapturedThis = true;
b = b.Parent == null ? null : b.Parent.Explicit;
- }
+ } while (b != null);
}
//
// The block that makes up the body for the anonymous method
//
- public ToplevelBlock Block {
+ public ParametersBlock Block {
get {
return block;
}
AnonymousMethodMethod method;
Field am_cache;
string block_name;
+ TypeInferenceContext return_inference;
static int unique_id;
public AnonymousMethodBody (ParametersCompiled parameters,
- ToplevelBlock block, TypeSpec return_type, TypeSpec delegate_type,
+ ParametersBlock block, TypeSpec return_type, TypeSpec delegate_type,
Location loc)
: base (block, return_type, loc)
{
this.parameters = parameters;
}
+ #region Properties
+
public override string ContainerType {
get { return "anonymous method"; }
}
+ public override bool IsIterator {
+ get { return false; }
+ }
+
+ public TypeInferenceContext ReturnTypeInference {
+ get {
+ return return_inference;
+ }
+ set {
+ return_inference = value;
+ }
+ }
+
public override AnonymousMethodStorey Storey {
get { return storey; }
}
- public override bool IsIterator {
- get { return false; }
- }
+ #endregion
public override Expression CreateExpressionTree (ResolveContext ec)
{
var hoisted_tparams = ec.CurrentTypeParameters;
var type_params = new TypeParameter[hoisted_tparams.Length];
for (int i = 0; i < type_params.Length; ++i) {
- type_params[i] = hoisted_tparams[i].CreateHoistedCopy (null);
+ type_params[i] = hoisted_tparams[i].CreateHoistedCopy (null, null);
}
generic_method = new GenericMethod (parent.NamespaceEntry, parent, member_name, type_params,
if (!method.MemberName.IsGeneric) {
TypeContainer parent = method.Parent.PartialContainer;
int id = parent.Fields == null ? 0 : parent.Fields.Count;
- am_cache = new Field (parent, new TypeExpression (type, loc),
+ var cache_type = storey != null && storey.Mutator != null ? storey.Mutator.Mutate (type) : type;
+
+ am_cache = new Field (parent, new TypeExpression (cache_type, loc),
Modifiers.STATIC | Modifiers.PRIVATE | Modifiers.COMPILER_GENERATED,
new MemberName (CompilerGeneratedClass.MakeName (null, "f", "am$cache", id), loc), null);
am_cache.Define ();
ec.Emit (OpCodes.Ldftn, TypeBuilder.GetMethod (t.GetMetaInfo (), (MethodInfo) delegate_method.GetMetaInfo ()));
} else {
+ if (delegate_method.IsGeneric)
+ delegate_method = delegate_method.MakeGenericMethod (method.TypeParameters);
+
ec.Emit (OpCodes.Ldftn, delegate_method);
}
//
public class AnonymousTypeClass : CompilerGeneratedClass
{
- sealed class AnonymousParameters : ParametersCompiled
+ // TODO: Merge with AnonymousTypeParameter
+ public class GeneratedParameter : Parameter
{
- public AnonymousParameters (CompilerContext ctx, params Parameter[] parameters)
- : base (ctx, parameters)
+ public GeneratedParameter (FullNamedExpression type, AnonymousTypeParameter p)
+ : base (type, p.Name, Modifier.NONE, null, p.Location)
{
}
-
- protected override void ErrorDuplicateName (Parameter p, Report Report)
- {
- Report.Error (833, p.Location, "`{0}': An anonymous type cannot have multiple properties with the same name",
- p.Name);
- }
}
static int types_counter;
{
string name = ClassNamePrefix + types_counter++;
- SimpleName [] t_args = new SimpleName [parameters.Count];
- TypeParameterName [] t_params = new TypeParameterName [parameters.Count];
- Parameter [] ctor_params = new Parameter [parameters.Count];
- for (int i = 0; i < parameters.Count; ++i) {
- AnonymousTypeParameter p = (AnonymousTypeParameter) parameters [i];
+ ParametersCompiled all_parameters;
+ TypeParameterName[] t_params;
+ SimpleName[] t_args;
+
+ if (parameters.Count == 0) {
+ all_parameters = ParametersCompiled.EmptyReadOnlyParameters;
+ t_params = new TypeParameterName[0];
+ t_args = null;
+ } else {
+ t_args = new SimpleName[parameters.Count];
+ t_params = new TypeParameterName[parameters.Count];
+ Parameter[] ctor_params = new Parameter[parameters.Count];
+ for (int i = 0; i < parameters.Count; ++i) {
+ AnonymousTypeParameter p = parameters[i];
+
+ t_args[i] = new SimpleName ("<" + p.Name + ">__T", p.Location);
+ t_params[i] = new TypeParameterName (t_args[i].Name, null, p.Location);
+ ctor_params[i] = new GeneratedParameter (t_args[i], p);
+ }
- t_args [i] = new SimpleName ("<" + p.Name + ">__T", p.Location);
- t_params [i] = new TypeParameterName (t_args [i].Name, null, p.Location);
- ctor_params [i] = new Parameter (t_args [i], p.Name, 0, null, p.Location);
+ all_parameters = new ParametersCompiled (ctor_params);
}
//
a_type.SetParameterInfo (null);
Constructor c = new Constructor (a_type, name, Modifiers.PUBLIC | Modifiers.DEBUGGER_HIDDEN,
- null, new AnonymousParameters (ctx, ctor_params), null, loc);
+ null, all_parameters, null, loc);
c.Block = new ToplevelBlock (ctx, c.ParameterInfo, loc);
//
//
bool error = false;
for (int i = 0; i < parameters.Count; ++i) {
- AnonymousTypeParameter p = (AnonymousTypeParameter) parameters [i];
+ AnonymousTypeParameter p = parameters [i];
Field f = new Field (a_type, t_args [i], Modifiers.PRIVATE | Modifiers.READONLY,
new MemberName ("<" + p.Name + ">", p.Location), null);
c.Block.AddStatement (new StatementExpression (
new SimpleAssign (new MemberAccess (new This (p.Location), f.Name),
- c.Block.GetParameterReference (p.Name, p.Location))));
+ c.Block.GetParameterReference (i, p.Location))));
ToplevelBlock get_block = new ToplevelBlock (ctx, p.Location);
get_block.AddStatement (new Return (
new MemberAccess (new This (p.Location), f.Name), p.Location));
- Accessor get_accessor = new Accessor (get_block, 0, null, null, p.Location);
+
Property prop = new Property (a_type, t_args [i], Modifiers.PUBLIC,
- new MemberName (p.Name, p.Location), null, get_accessor, null, false);
+ new MemberName (p.Name, p.Location), null);
+ prop.Get = new Property.GetMethod (prop, 0, null, p.Location);
+ prop.Get.Block = get_block;
a_type.AddProperty (prop);
}
return true;
}
- Report.SymbolRelatedToPreviousError (mc);
- return false;
+ // A conflict between anonymous type members will be reported
+ if (symbol is TypeParameter) {
+ Report.SymbolRelatedToPreviousError (symbol);
+ return false;
+ }
+
+ // Ignore other conflicts
+ return true;
}
protected override bool DoDefineMembers ()
Location loc = Location;
- Method equals = new Method (this, null, TypeManager.system_boolean_expr,
+ var equals_parameters = ParametersCompiled.CreateFullyResolved (
+ new Parameter (new TypeExpression (TypeManager.object_type, loc), "obj", 0, null, loc), TypeManager.object_type);
+
+ Method equals = new Method (this, null, new TypeExpression (TypeManager.bool_type, loc),
Modifiers.PUBLIC | Modifiers.OVERRIDE | Modifiers.DEBUGGER_HIDDEN, new MemberName ("Equals", loc),
- Mono.CSharp.ParametersCompiled.CreateFullyResolved (new Parameter (null, "obj", 0, null, loc), TypeManager.object_type), null);
+ equals_parameters, null);
- Method tostring = new Method (this, null, TypeManager.system_string_expr,
+ equals_parameters[0].Resolve (equals, 0);
+
+ Method tostring = new Method (this, null, new TypeExpression (TypeManager.string_type, loc),
Modifiers.PUBLIC | Modifiers.OVERRIDE | Modifiers.DEBUGGER_HIDDEN, new MemberName ("ToString", loc),
Mono.CSharp.ParametersCompiled.EmptyReadOnlyParameters, null);
ToplevelBlock equals_block = new ToplevelBlock (Compiler, equals.ParameterInfo, loc);
+
TypeExpr current_type;
if (type_params != null) {
var targs = new TypeArguments ();
current_type = new TypeExpression (Definition, loc);
}
- equals_block.AddVariable (current_type, "other", loc);
- LocalVariableReference other_variable = new LocalVariableReference (equals_block, "other", loc);
+ var li_other = LocalVariable.CreateCompilerGenerated (CurrentType, equals_block, loc);
+ equals_block.AddStatement (new BlockVariableDeclaration (new TypeExpression (li_other.Type, loc), li_other));
+ var other_variable = new LocalVariableReference (li_other, loc);
MemberAccess system_collections_generic = new MemberAccess (new MemberAccess (
new QualifiedAliasMember ("global", "System", loc), "Collections", loc), "Generic", loc);
new MemberAccess (new This (f.Location), f.Name), new NullLiteral (loc), loc)),
new Invocation (new MemberAccess (
new MemberAccess (new This (f.Location), f.Name), "ToString"), null),
- new StringConstant (string.Empty, loc));
+ new StringConstant (string.Empty, loc), loc);
if (rs_equals == null) {
rs_equals = field_equal;
//
// Equals (object obj) override
//
- LocalVariableReference other_variable_assign = new LocalVariableReference (equals_block, "other", loc);
+ var other_variable_assign = new TemporaryVariableReference (li_other, loc);
equals_block.AddStatement (new StatementExpression (
new SimpleAssign (other_variable_assign,
- new As (equals_block.GetParameterReference ("obj", loc),
+ new As (equals_block.GetParameterReference (0, loc),
current_type, loc), loc)));
Expression equals_test = new Binary (Binary.Operator.Inequality, other_variable, new NullLiteral (loc), loc);
//
// GetHashCode () override
//
- Method hashcode = new Method (this, null, TypeManager.system_int32_expr,
+ Method hashcode = new Method (this, null, new TypeExpression (TypeManager.int32_type, loc),
Modifiers.PUBLIC | Modifiers.OVERRIDE | Modifiers.DEBUGGER_HIDDEN,
new MemberName ("GetHashCode", loc),
Mono.CSharp.ParametersCompiled.EmptyReadOnlyParameters, null);
// hash += hash << 5;
ToplevelBlock hashcode_top = new ToplevelBlock (Compiler, loc);
- Block hashcode_block = new Block (hashcode_top);
- hashcode_top.AddStatement (new Unchecked (hashcode_block));
+ Block hashcode_block = new Block (hashcode_top, loc, loc);
+ hashcode_top.AddStatement (new Unchecked (hashcode_block, loc));
- hashcode_block.AddVariable (TypeManager.system_int32_expr, "hash", loc);
- LocalVariableReference hash_variable = new LocalVariableReference (hashcode_block, "hash", loc);
- LocalVariableReference hash_variable_assign = new LocalVariableReference (hashcode_block, "hash", loc);
+ var li_hash = LocalVariable.CreateCompilerGenerated (TypeManager.int32_type, hashcode_top, loc);
+ hashcode_block.AddStatement (new BlockVariableDeclaration (new TypeExpression (li_hash.Type, loc), li_hash));
+ LocalVariableReference hash_variable_assign = new LocalVariableReference (li_hash, loc);
hashcode_block.AddStatement (new StatementExpression (
new SimpleAssign (hash_variable_assign, rs_hashcode)));
+ var hash_variable = new LocalVariableReference (li_hash, loc);
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (13, loc), loc))));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (13, loc), loc), loc)));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
- new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (7, loc), loc))));
+ new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (7, loc), loc), loc)));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (3, loc), loc))));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (3, loc), loc), loc)));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.ExclusiveOr, hash_variable,
- new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (17, loc), loc))));
+ new Binary (Binary.Operator.RightShift, hash_variable, new IntConstant (17, loc), loc), loc)));
hashcode_block.AddStatement (new StatementExpression (
new CompoundAssign (Binary.Operator.Addition, hash_variable,
- new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (5, loc), loc))));
+ new Binary (Binary.Operator.LeftShift, hash_variable, new IntConstant (5, loc), loc), loc)));
hashcode_block.AddStatement (new Return (hash_variable, loc));
hashcode.Block = hashcode_top;
projects / mono.git / blobdiff