public override bool EnableOverloadChecks (MemberCore overload)
{
- if (overload is MethodCore || overload is AbstractPropertyEventMethod) {
+ if (overload is MethodCore) {
caching_flags |= Flags.MethodOverloadsExist;
return true;
}
+ if (overload is AbstractPropertyEventMethod)
+ return true;
+
return base.EnableOverloadChecks (overload);
}
}
if ((state & StateFlags.PendingMakeMethod) != 0) {
- metaInfo = ((MethodInfo) metaInfo).MakeGenericMethod (targs.Select (l => l.GetMetaInfo ()).ToArray ());
+ var sre_targs = new Type[targs.Length];
+ for (int i = 0; i < sre_targs.Length; ++i)
+ sre_targs[i] = targs[i].GetMetaInfo ();
+
+ metaInfo = ((MethodInfo) metaInfo).MakeGenericMethod (sre_targs);
state &= ~StateFlags.PendingMakeMethod;
}
- if (Kind == MemberKind.FakeMethod)
- throw new InternalErrorException ("Emitting fake method");
-
return metaInfo;
}
ms.returnType = inflator.Inflate (returnType);
ms.parameters = parameters.Inflate (inflator);
if (IsGeneric)
- ms.constraints = TypeParameterSpec.InflateConstraints (inflator, GenericDefinition.TypeParameters);
+ ms.constraints = TypeParameterSpec.InflateConstraints (inflator, Constraints);
return ms;
}
var ms = (MethodSpec) MemberwiseClone ();
if (decl != DeclaringType) {
// Gets back MethodInfo in case of metaInfo was inflated
- ms.metaInfo = MemberCache.GetMember (DeclaringType.GetDefinition (), this).metaInfo;
+ ms.metaInfo = MemberCache.GetMember (TypeParameterMutator.GetMemberDeclaringType (DeclaringType), this).metaInfo;
ms.declaringType = decl;
ms.state |= StateFlags.PendingMetaInflate;
public override void Emit ()
{
if ((ModFlags & Modifiers.COMPILER_GENERATED) != 0 && !Parent.IsCompilerGenerated)
- PredefinedAttributes.Get.CompilerGenerated.EmitAttribute (MethodBuilder);
+ Compiler.PredefinedAttributes.CompilerGenerated.EmitAttribute (MethodBuilder);
if ((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0)
- PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (MethodBuilder);
+ Compiler.PredefinedAttributes.DebuggerHidden.EmitAttribute (MethodBuilder);
if (ReturnType == InternalType.Dynamic) {
return_attributes = new ReturnParameter (this, MethodBuilder, Location);
- PredefinedAttributes.Get.Dynamic.EmitAttribute (return_attributes.Builder);
+ Compiler.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder);
} else {
var trans_flags = TypeManager.HasDynamicTypeUsed (ReturnType);
if (trans_flags != null) {
- var pa = PredefinedAttributes.Get.DynamicTransform;
+ var pa = Compiler.PredefinedAttributes.DynamicTransform;
if (pa.Constructor != null || pa.ResolveConstructor (Location, ArrayContainer.MakeType (TypeManager.bool_type))) {
return_attributes = new ReturnParameter (this, MethodBuilder, Location);
return_attributes.Builder.SetCustomAttribute (
if (OptAttributes == null)
return null;
- Attribute[] attrs = OptAttributes.SearchMulti (PredefinedAttributes.Get.Conditional);
+ Attribute[] attrs = OptAttributes.SearchMulti (Compiler.PredefinedAttributes.Conditional);
if (attrs == null)
return null;
public class Method : MethodOrOperator, IGenericMethodDefinition
{
- /// <summary>
- /// Modifiers allowed in a class declaration
- /// </summary>
- const Modifiers AllowedModifiers =
- Modifiers.NEW |
- Modifiers.PUBLIC |
- Modifiers.PROTECTED |
- Modifiers.INTERNAL |
- Modifiers.PRIVATE |
- Modifiers.STATIC |
- Modifiers.VIRTUAL |
- Modifiers.SEALED |
- Modifiers.OVERRIDE |
- Modifiers.ABSTRACT |
- Modifiers.UNSAFE |
- Modifiers.EXTERN;
-
- const Modifiers AllowedInterfaceModifiers =
- Modifiers.NEW | Modifiers.UNSAFE;
-
Method partialMethodImplementation;
public Method (DeclSpace parent, GenericMethod generic,
FullNamedExpression return_type, Modifiers mod,
MemberName name, ParametersCompiled parameters, Attributes attrs)
: base (parent, generic, return_type, mod,
- parent.PartialContainer.Kind == MemberKind.Interface ? AllowedInterfaceModifiers : AllowedModifiers,
+ parent.PartialContainer.Kind == MemberKind.Interface ? AllowedModifiersInterface :
+ parent.PartialContainer.Kind == MemberKind.Struct ? AllowedModifiersStruct :
+ AllowedModifiersClass,
name, attrs, parameters)
{
}
public TypeParameterSpec[] TypeParameters {
get {
+ // TODO: Cache this
return CurrentTypeParameters.Select (l => l.Type).ToArray ();
}
}
return;
}
- if (ReturnType != TypeManager.void_type) {
- Report.Error (578, Location, "Conditional not valid on `{0}' because its return type is not void", GetSignatureForError ());
+ if ((ModFlags & Modifiers.OVERRIDE) != 0) {
+ Report.Error (243, Location, "Conditional not valid on `{0}' because it is an override method", GetSignatureForError ());
return;
}
- if ((ModFlags & Modifiers.OVERRIDE) != 0) {
- Report.Error (243, Location, "Conditional not valid on `{0}' because it is an override method", GetSignatureForError ());
+ if (ReturnType != TypeManager.void_type) {
+ Report.Error (578, Location, "Conditional not valid on `{0}' because its return type is not void", GetSignatureForError ());
return;
}
base.ApplyAttributeBuilder (a, ctor, cdata, pa);
}
- protected override bool CheckForDuplications ()
- {
- if (!base.CheckForDuplications ())
- return false;
-
- var ar = Parent.PartialContainer.Properties;
- if (ar != null) {
- for (int i = 0; i < ar.Count; ++i) {
- PropertyBase pb = (PropertyBase) ar [i];
- if (pb.AreAccessorsDuplicateImplementation (this))
- return false;
- }
- }
-
- ar = Parent.PartialContainer.Indexers;
- if (ar != null) {
- for (int i = 0; i < ar.Count; ++i) {
- PropertyBase pb = (PropertyBase) ar [i];
- if (pb.AreAccessorsDuplicateImplementation (this))
- return false;
- }
- }
-
- return true;
- }
-
protected virtual void DefineTypeParameters ()
{
var tparams = CurrentTypeParameters;
TypeParameterSpec[] base_tparams = null;
+ TypeParameterSpec[] base_decl_tparams = TypeParameterSpec.EmptyTypes;
+ TypeSpec[] base_targs = TypeSpec.EmptyTypes;
if (((ModFlags & Modifiers.OVERRIDE) != 0 || IsExplicitImpl)) {
- if (base_method != null)
+ if (base_method != null) {
base_tparams = base_method.GenericDefinition.TypeParameters;
- else if (MethodData.implementing != null)
+
+ if (base_method.DeclaringType.IsGeneric) {
+ base_decl_tparams = base_method.DeclaringType.MemberDefinition.TypeParameters;
+ base_targs = Parent.BaseType.TypeArguments;
+ }
+
+ if (base_method.IsGeneric) {
+ if (base_decl_tparams.Length != 0) {
+ base_decl_tparams = base_decl_tparams.Concat (base_tparams).ToArray ();
+ base_targs = base_targs.Concat (tparams.Select<TypeParameter, TypeSpec> (l => l.Type)).ToArray ();
+ } else {
+ base_decl_tparams = base_tparams;
+ base_targs = tparams.Select (l => l.Type).ToArray ();
+ }
+ }
+ } else if (MethodData.implementing != null) {
base_tparams = MethodData.implementing.GenericDefinition.TypeParameters;
+ if (MethodData.implementing.DeclaringType.IsGeneric) {
+ base_decl_tparams = MethodData.implementing.DeclaringType.MemberDefinition.TypeParameters;
+ foreach (var iface in Parent.CurrentType.Interfaces) {
+ if (iface == MethodData.implementing.DeclaringType) {
+ base_targs = iface.TypeArguments;
+ break;
+ }
+ }
+ }
+ }
}
for (int i = 0; i < tparams.Length; ++i) {
if (base_tparams != null) {
var base_tparam = base_tparams[i];
tp.Type.SpecialConstraint = base_tparam.SpecialConstraint;
- tp.Type.TypeArguments = base_tparam.TypeArguments;
- // TODO MemberCache: Inflate with different MVAR ?
- tp.Type.Interfaces = base_tparam.Interfaces;
- tp.Type.BaseType = base_tparam.BaseType;
+ var inflator = new TypeParameterInflator (CurrentType, base_decl_tparams, base_targs);
+ base_tparam.InflateConstraints (inflator, tp.Type);
} else if (MethodData.implementing != null) {
var base_tp = MethodData.implementing.Constraints[i];
if (!tp.Type.HasSameConstraintsImplementation (base_tp)) {
//
public override bool Define ()
{
- if (type_expr == TypeManager.system_void_expr && parameters.IsEmpty && Name == Destructor.MetadataName) {
+ if (type_expr.Type == TypeManager.void_type && parameters.IsEmpty && MemberName.Arity == 0 && MemberName.Name == Destructor.MetadataName) {
Report.Warning (465, 1, Location, "Introducing `Finalize' method can interfere with destructor invocation. Did you intend to declare a destructor?");
}
DefineTypeParameters ();
}
- if (block != null && block.IsIterator && !(Parent is IteratorStorey)) {
+ if (block != null && block.IsIterator) {
//
// Current method is turned into automatically generated
// wrapper which creates an instance of iterator
Report.Error (1109, Location, "`{0}': Extension methods cannot be defined in a nested class",
GetSignatureForError ());
- PredefinedAttribute pa = PredefinedAttributes.Get.Extension;
+ PredefinedAttribute pa = Compiler.PredefinedAttributes.Extension;
if (!pa.IsDefined) {
Report.Error (1110, Location,
"`{0}': Extension methods cannot be declared without a reference to System.Core.dll assembly. Add the assembly reference or remove `this' modifer from the first parameter",
public override void Emit ()
{
try {
- Report.Debug (64, "METHOD EMIT", this, MethodBuilder, Location, Block, MethodData);
if (IsPartialDefinition) {
//
// Use partial method implementation builder for partial method declaration attributes
//
if (partialMethodImplementation != null) {
MethodBuilder = partialMethodImplementation.MethodBuilder;
- return;
}
- } else if ((ModFlags & Modifiers.PARTIAL) != 0 && (caching_flags & Flags.PartialDefinitionExists) == 0) {
+
+ return;
+ }
+
+ if ((ModFlags & Modifiers.PARTIAL) != 0 && (caching_flags & Flags.PartialDefinitionExists) == 0) {
Report.Error (759, Location, "A partial method `{0}' implementation is missing a partial method declaration",
GetSignatureForError ());
}
base.Emit ();
if ((ModFlags & Modifiers.METHOD_EXTENSION) != 0)
- PredefinedAttributes.Get.Extension.EmitAttribute (MethodBuilder);
+ Compiler.PredefinedAttributes.Extension.EmitAttribute (MethodBuilder);
} catch {
Console.WriteLine ("Internal compiler error at {0}: exception caught while emitting {1}",
Location, MethodBuilder);
public abstract class ConstructorInitializer : ExpressionStatement
{
Arguments argument_list;
- MethodGroupExpr base_constructor_group;
+ MethodSpec base_ctor;
public ConstructorInitializer (Arguments argument_list, Location loc)
{
return this;
}
- base_constructor_group = MemberLookupFinal (
- ec, null, type, ConstructorBuilder.ConstructorName, 0, MemberKind.Constructor,
- BindingRestriction.AccessibleOnly | BindingRestriction.DeclaredOnly,
- loc) as MethodGroupExpr;
-
- if (base_constructor_group == null)
- return this;
-
- base_constructor_group = base_constructor_group.OverloadResolve (
- ec, ref argument_list, false, loc);
-
- if (base_constructor_group == null)
- return this;
-
- if (!ec.IsStatic)
- base_constructor_group.InstanceExpression = ec.GetThis (loc);
-
- var base_ctor = base_constructor_group.BestCandidate;
-
+ base_ctor = ConstructorLookup (ec, type, ref argument_list, loc);
+
// TODO MemberCache: Does it work for inflated types ?
if (base_ctor == caller_builder.Spec){
ec.Report.Error (516, loc, "Constructor `{0}' cannot call itself",
public override void Emit (EmitContext ec)
{
// It can be null for static initializers
- if (base_constructor_group == null)
+ if (base_ctor == null)
return;
ec.Mark (loc);
- base_constructor_group.EmitCall (ec, argument_list);
+ Invocation.EmitCall (ec, new CompilerGeneratedThis (type, loc), base_ctor, argument_list, loc);
}
public override void EmitStatement (EmitContext ec)
}
if ((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0)
- PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (ConstructorBuilder);
+ Compiler.PredefinedAttributes.DebuggerHidden.EmitAttribute (ConstructorBuilder);
if (OptAttributes != null)
OptAttributes.Emit ();
// initializer, it must initialize all of the struct's fields.
if ((Parent.PartialContainer.Kind == MemberKind.Struct) &&
((ModFlags & Modifiers.STATIC) == 0) && (Initializer == null))
- block.AddThisVariable (Parent, Location);
+ block.AddThisVariable (bc, Parent, Location);
if (block != null && (ModFlags & Modifiers.STATIC) == 0){
if (Parent.PartialContainer.Kind == MemberKind.Class && Initializer == null)
}
}
- parameters.ApplyAttributes (ConstructorBuilder);
+ parameters.ApplyAttributes (this, ConstructorBuilder);
SourceMethod source = SourceMethod.Create (Parent, ConstructorBuilder, block);
if (block != null) {
- if (block.Resolve (null, bc, parameters, this)) {
+ if (block.Resolve (null, bc, this)) {
EmitContext ec = new EmitContext (this, ConstructorBuilder.GetILGenerator (), bc.ReturnType);
ec.With (EmitContext.Options.ConstructorScope, true);
Report.SymbolRelatedToPreviousError (implementing);
Report.Error (686, method.Location, "Accessor `{0}' cannot implement interface member `{1}' for type `{2}'. Use an explicit interface implementation",
method.GetSignatureForError (), TypeManager.CSharpSignature (implementing), container.GetSignatureForError ());
- return false;
- }
- PropertyBase.PropertyMethod pm = prop_method as PropertyBase.PropertyMethod;
- if (pm != null && pm.HasCustomAccessModifier && (pm.ModFlags & Modifiers.PUBLIC) == 0) {
- Report.SymbolRelatedToPreviousError (implementing);
- Report.Error (277, method.Location, "Accessor `{0}' must be declared public to implement interface member `{1}'",
- method.GetSignatureForError (), implementing.GetSignatureForError ());
- return false;
+ } else {
+ PropertyBase.PropertyMethod pm = prop_method as PropertyBase.PropertyMethod;
+ if (pm != null && pm.HasCustomAccessModifier && (pm.ModFlags & Modifiers.PUBLIC) == 0) {
+ Report.SymbolRelatedToPreviousError (implementing);
+ Report.Error (277, method.Location, "Accessor `{0}' must be declared public to implement interface member `{1}'",
+ method.GetSignatureForError (), implementing.GetSignatureForError ());
+ }
}
}
}
Report.SymbolRelatedToPreviousError (implementing);
Report.Error (466, method.Location, "`{0}': the explicit interface implementation cannot introduce the params modifier",
method.GetSignatureForError ());
- return false;
}
} else {
if (implementing.DeclaringType.IsInterface) {
if ((modifiers & Modifiers.OVERRIDE) == 0)
flags |= MethodAttributes.NewSlot;
}
- flags |=
- MethodAttributes.Virtual |
- MethodAttributes.HideBySig;
+
+ flags |= MethodAttributes.Virtual | MethodAttributes.HideBySig;
// Set Final unless we're virtual, abstract or already overriding a method.
if ((modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) == 0)
flags |= MethodAttributes.Final;
+
+ //
+ // clear the pending implementation flag (requires explicit methods to be defined first)
+ //
+ parent.PartialContainer.PendingImplementations.ImplementMethod (method.MethodName,
+ member.InterfaceType, this, member.IsExplicitImpl);
+
+ //
+ // Update indexer accessor name to match implementing abstract accessor
+ //
+ if (!implementing.DeclaringType.IsInterface && !member.IsExplicitImpl && implementing.IsAccessor)
+ method_full_name = implementing.MemberDefinition.Name;
}
DefineMethodBuilder (container, method_full_name, method.ParameterInfo);
if (GenericMethod != null)
GenericMethod.EmitAttributes ();
- method.ParameterInfo.ApplyAttributes (MethodBuilder);
+ var mc = (IMemberContext) method;
- //
- // clear the pending implementation flag
- //
- if (implementing != null)
- parent.PartialContainer.PendingImplementations.ImplementMethod (method.MethodName,
- member.InterfaceType, this, member.IsExplicitImpl);
+ method.ParameterInfo.ApplyAttributes (mc, MethodBuilder);
SourceMethod source = SourceMethod.Create (parent, MethodBuilder, method.Block);
ToplevelBlock block = method.Block;
if (block != null) {
- BlockContext bc = new BlockContext ((IMemberContext) method, block, method.ReturnType);
- if (block.Resolve (null, bc, method.ParameterInfo, method)) {
+ BlockContext bc = new BlockContext (mc, block, method.ReturnType);
+ if (block.Resolve (null, bc, method)) {
EmitContext ec = method.CreateEmitContext (MethodBuilder.GetILGenerator ());
if (!ec.HasReturnLabel && bc.HasReturnLabel) {
ec.ReturnLabel = bc.ReturnLabel;
public static readonly string MetadataName = "Finalize";
public Destructor (DeclSpace parent, Modifiers mod, ParametersCompiled parameters, Attributes attrs, Location l)
- : base (parent, null, TypeManager.system_void_expr, mod, AllowedModifiers,
+ : base (parent, null, null, mod, AllowedModifiers,
new MemberName (MetadataName, l), attrs, parameters)
{
ModFlags &= ~Modifiers.PRIVATE;
protected override bool CheckBase ()
{
- if (!base.CheckBase ())
- return false;
+ // Don't check base, destructors have special syntax
+ return true;
+ }
+ public override void Emit()
+ {
var base_type = Parent.PartialContainer.BaseType;
- if (base_type == null)
- return true;
+ if (base_type != null && Block != null) {
+ var base_dtor = MemberCache.FindMember (base_type,
+ new MemberFilter (MetadataName, 0, MemberKind.Destructor, null, null), BindingRestriction.InstanceOnly) as MethodSpec;
- if (Block != null) {
- MethodGroupExpr method_expr = Expression.MethodLookup (Parent.Module.Compiler, Parent.Definition, base_type, MemberKind.Destructor, MetadataName, 0, Location);
- if (method_expr == null)
+ if (base_dtor == null)
throw new NotImplementedException ();
- method_expr.IsBase = true;
- method_expr.InstanceExpression = new CompilerGeneratedThis (Parent.Definition, Location);
+ MethodGroupExpr method_expr = MethodGroupExpr.CreatePredefined (base_dtor, base_type, Location);
+ method_expr.InstanceExpression = new BaseThis (base_type, Location);
- ToplevelBlock new_block = new ToplevelBlock (Compiler, Block.StartLocation);
- new_block.EndLocation = Block.EndLocation;
-
- Block finaly_block = new ExplicitBlock (new_block, Location, Location);
- Block try_block = new Block (new_block, block);
+ var try_block = new ExplicitBlock (block, block.StartLocation, block.EndLocation);
+ var finaly_block = new ExplicitBlock (block, Location, Location);
//
// 0-size arguments to avoid CS0250 error
// debugger scope
//
finaly_block.AddStatement (new StatementExpression (new Invocation (method_expr, new Arguments (0))));
- new_block.AddStatement (new TryFinally (try_block, finaly_block, Location));
- block = new_block;
+ var tf = new TryFinally (try_block, finaly_block, Location);
+ block.WrapIntoDestructor (tf, try_block);
}
- return true;
+ base.Emit ();
}
public override string GetSignatureForError ()
return Parent.GetSignatureForError () + ".~" + Parent.MemberName.Name + "()";
}
+ protected override bool ResolveMemberType ()
+ {
+ member_type = TypeManager.void_type;
+ return true;
+ }
+
public override string[] ValidAttributeTargets {
get {
return attribute_targets;
protected ToplevelBlock block;
protected Dictionary<SecurityAction, PermissionSet> declarative_security;
- // The accessor are created even if they are not wanted.
- // But we need them because their names are reserved.
- // Field says whether accessor will be emited or not
- public readonly bool IsDummy;
-
protected readonly string prefix;
ReturnParameter return_attributes;
- public AbstractPropertyEventMethod (PropertyBasedMember member, string prefix)
- : base (member.Parent, SetupName (prefix, member, member.Location), null)
- {
- this.prefix = prefix;
- IsDummy = true;
- }
-
- public AbstractPropertyEventMethod (InterfaceMemberBase member, Accessor accessor,
- string prefix)
- : base (member.Parent, SetupName (prefix, member, accessor.Location),
- accessor.Attributes)
+ public AbstractPropertyEventMethod (InterfaceMemberBase member, string prefix, Attributes attrs, Location loc)
+ : base (member.Parent, SetupName (prefix, member, loc), attrs)
{
this.prefix = prefix;
- this.block = accessor.Block;
}
static MemberName SetupName (string prefix, InterfaceMemberBase member, Location loc)
method_data.Emit (parent);
if ((ModFlags & Modifiers.COMPILER_GENERATED) != 0 && !Parent.IsCompilerGenerated)
- PredefinedAttributes.Get.CompilerGenerated.EmitAttribute (method_data.MethodBuilder);
+ Compiler.PredefinedAttributes.CompilerGenerated.EmitAttribute (method_data.MethodBuilder);
if (((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0))
- PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (method_data.MethodBuilder);
+ Compiler.PredefinedAttributes.DebuggerHidden.EmitAttribute (method_data.MethodBuilder);
if (ReturnType == InternalType.Dynamic) {
return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
- PredefinedAttributes.Get.Dynamic.EmitAttribute (return_attributes.Builder);
+ Compiler.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder);
} else {
var trans_flags = TypeManager.HasDynamicTypeUsed (ReturnType);
if (trans_flags != null) {
- var pa = PredefinedAttributes.Get.DynamicTransform;
+ var pa = Compiler.PredefinedAttributes.DynamicTransform;
if (pa.Constructor != null || pa.ResolveConstructor (Location, ArrayContainer.MakeType (TypeManager.bool_type))) {
return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
return_attributes.Builder.SetCustomAttribute (
public override bool EnableOverloadChecks (MemberCore overload)
{
+ if (overload is MethodCore) {
+ caching_flags |= Flags.MethodOverloadsExist;
+ return true;
+ }
+
// This can only happen with indexers and it will
// be catched as indexer difference
if (overload is AbstractPropertyEventMethod)
return true;
- if (overload is MethodCore) {
- caching_flags |= Flags.MethodOverloadsExist;
- return true;
- }
return false;
}
return false;
}
- public bool IsDuplicateImplementation (MethodCore method)
- {
- if (!MemberName.Equals (method.MemberName))
- return false;
-
- TypeSpec[] param_types = method.ParameterTypes;
-
- if (param_types == null || param_types.Length != ParameterTypes.Length)
- return false;
-
- for (int i = 0; i < param_types.Length; i++)
- if (param_types [i] != ParameterTypes [i])
- return false;
-
- Report.SymbolRelatedToPreviousError (method);
- Report.Error (82, Location, "A member `{0}' is already reserved",
- method.GetSignatureForError ());
- return true;
- }
-
- public override bool IsUsed {
- get {
- if (IsDummy)
- return false;
-
- return base.IsUsed;
- }
- }
-
public MethodSpec Spec { get; protected set; }
//
if (!base.Define ())
return false;
- if (block != null && block.IsIterator && !(Parent is IteratorStorey)) {
+ if (block != null && block.IsIterator) {
//
// Current method is turned into automatically generated
// wrapper which creates an instance of iterator
if (TypeManager.IsNullableType (return_type))
return_type_unwrap = TypeManager.GetTypeArguments (return_type) [0];
- if (return_type == InternalType.Dynamic || first_arg_type == InternalType.Dynamic) {
- Report.Error (1964, Location,
- "User-defined operator `{0}' cannot convert to or from the dynamic type",
- GetSignatureForError ());
-
- return false;
- }
-
//
// Rules for conversion operators
//
if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
- if (first_arg_type_unwrap == return_type_unwrap && first_arg_type_unwrap == declaring_type){
+ if (first_arg_type_unwrap == return_type_unwrap && first_arg_type_unwrap == declaring_type) {
Report.Error (555, Location,
"User-defined operator cannot take an object of the enclosing type and convert to an object of the enclosing type");
return false;
}
-
+
TypeSpec conv_type;
- if (TypeManager.IsEqual (declaring_type, return_type) || declaring_type == return_type_unwrap) {
+ if (declaring_type == return_type || declaring_type == return_type_unwrap) {
conv_type = first_arg_type;
- } else if (TypeManager.IsEqual (declaring_type, first_arg_type) || declaring_type == first_arg_type_unwrap) {
+ } else if (declaring_type == first_arg_type || declaring_type == first_arg_type_unwrap) {
conv_type = return_type;
} else {
- Report.Error (556, Location,
+ Report.Error (556, Location,
"User-defined conversion must convert to or from the enclosing type");
return false;
}
- //
- // Because IsInterface and IsClass are not supported
- //
- if (!TypeManager.IsGenericParameter (conv_type)) {
- if (conv_type.IsInterface) {
- Report.Error (552, Location, "User-defined conversion `{0}' cannot convert to or from an interface type",
+ if (conv_type == InternalType.Dynamic) {
+ Report.Error (1964, Location,
+ "User-defined conversion `{0}' cannot convert to or from the dynamic type",
+ GetSignatureForError ());
+
+ return false;
+ }
+
+ if (conv_type.IsInterface) {
+ Report.Error (552, Location, "User-defined conversion `{0}' cannot convert to or from an interface type",
+ GetSignatureForError ());
+ return false;
+ }
+
+ if (conv_type.IsClass) {
+ if (TypeSpec.IsBaseClass (declaring_type, conv_type, true)) {
+ Report.Error (553, Location, "User-defined conversion `{0}' cannot convert to or from a base class",
GetSignatureForError ());
return false;
}
- if (conv_type.IsClass) {
- if (TypeManager.IsSubclassOf (declaring_type, conv_type)) {
- Report.Error (553, Location, "User-defined conversion `{0}' cannot convert to or from a base class",
- GetSignatureForError ());
- return false;
- }
-
- if (TypeManager.IsSubclassOf (conv_type, declaring_type)) {
- Report.Error (554, Location, "User-defined conversion `{0}' cannot convert to or from a derived class",
- GetSignatureForError ());
- return false;
- }
+ if (TypeSpec.IsBaseClass (conv_type, declaring_type, false)) {
+ Report.Error (554, Location, "User-defined conversion `{0}' cannot convert to or from a derived class",
+ GetSignatureForError ());
+ return false;
}
}
} else if (OperatorType == OpType.LeftShift || OperatorType == OpType.RightShift) {
// Checks for Unary operators
if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
- if (return_type != declaring_type && !TypeManager.IsSubclassOf (return_type, declaring_type)) {
+ if (return_type != declaring_type && !TypeSpec.IsBaseClass (return_type, declaring_type, false)) {
Report.Error (448, Location,
"The return type for ++ or -- operator must be the containing type or derived from the containing type");
return false;
return false;
}
}
-
- if (!TypeManager.IsEqual (first_arg_type_unwrap, declaring_type)){
+
+ if (first_arg_type_unwrap != declaring_type) {
Report.Error (562, Location,
"The parameter type of a unary operator must be the containing type");
return false;
}
-
+
if (OperatorType == OpType.True || OperatorType == OpType.False) {
- if (return_type != TypeManager.bool_type){
+ if (return_type != TypeManager.bool_type) {
Report.Error (
215, Location,
"The return type of operator True or False " +
return false;
}
}
-
- } else if (!TypeManager.IsEqual (first_arg_type_unwrap, declaring_type)) {
+
+ } else if (first_arg_type_unwrap != declaring_type) {
// Checks for Binary operators
- var second_arg_type = ParameterTypes [1];
+ var second_arg_type = ParameterTypes[1];
if (TypeManager.IsNullableType (second_arg_type))
- second_arg_type = TypeManager.GetTypeArguments (second_arg_type) [0];
+ second_arg_type = TypeManager.GetTypeArguments (second_arg_type)[0];
- if (!TypeManager.IsEqual (second_arg_type, declaring_type)) {
+ if (second_arg_type != declaring_type) {
Report.Error (563, Location,
"One of the parameters of a binary operator must be the containing type");
return false;
projects / mono.git / blobdiff