2005-01-26 Martin Baulig <martin@ximian.com>
[mono.git] / mcs / mbas / ecore.cs
index 2994eacb5661c93252ce0de28b9048ec2a7656da..ea797d479b7489e4f404aad9b50276403d9a5505 100644 (file)
@@ -8,7 +8,7 @@
 //
 //
 
-namespace Mono.CSharp {
+namespace Mono.MonoBASIC {
        using System;
        using System.Collections;
        using System.Diagnostics;
@@ -82,7 +82,7 @@ namespace Mono.CSharp {
                ///   The AddressOf method should generate code that loads
                ///   the address of the object and leaves it on the stack.
                ///
-               ///   The `mode' argument is used to notify the expression
+               ///   The 'mode' argument is used to notify the expression
                ///   of whether this will be used to read from the address or
                ///   write to the address.
                ///
@@ -108,7 +108,7 @@ namespace Mono.CSharp {
                bool IsAssigned (EmitContext ec, Location loc);
 
                /// <summary>
-               ///   Checks whether field `name' in this struct has been assigned.
+               ///   Checks whether field 'name' in this struct has been assigned.
                /// </summary>
                bool IsFieldAssigned (EmitContext ec, string name, Location loc);
 
@@ -122,7 +122,7 @@ namespace Mono.CSharp {
                void SetAssigned (EmitContext ec);
 
                /// <summary>
-               ///   Tells the flow analysis code that field `name' in this struct
+               ///   Tells the flow analysis code that field 'name' in this struct
                ///   has already been assigned atthe current code position.
                /// </summary>
                void SetFieldAssigned (EmitContext ec, string name);
@@ -155,6 +155,13 @@ namespace Mono.CSharp {
                        get;
                }
 
+               /// <summary>
+               ///   The type which declares this member.
+               /// </summary>
+               Type DeclaringType {
+                       get;
+               }
+
                /// <summary>
                ///   The instance expression associated with this member, if it's a
                ///   non-static member.
@@ -223,7 +230,7 @@ namespace Mono.CSharp {
 
                /// <summary>
                ///   Utility wrapper routine for Warning, only prints the warning if
-               ///   warnings of level `level' are enabled.
+               ///   warnings of level 'level' are enabled.
                /// </summary>
                public void Warning (int warning, int level, string s)
                {
@@ -234,8 +241,8 @@ namespace Mono.CSharp {
                static public void Error_CannotConvertType (Location loc, Type source, Type target)
                {
                        Report.Error (30, loc, "Cannot convert type '" +
-                                     TypeManager.CSharpName (source) + "' to '" +
-                                     TypeManager.CSharpName (target) + "'");
+                                     TypeManager.MonoBASIC_Name (source) + "' to '" +
+                                     TypeManager.MonoBASIC_Name (target) + "'");
                }
 
                /// <summary>
@@ -261,7 +268,7 @@ namespace Mono.CSharp {
                ///   There are two side effects expected from calling
                ///   Resolve(): the the field variable "eclass" should
                ///   be set to any value of the enumeration
-               ///   `ExprClass' and the type variable should be set
+               ///   'ExprClass' and the type variable should be set
                ///   to a valid type (this is the type of the
                ///   expression).
                /// </remarks>
@@ -295,14 +302,16 @@ namespace Mono.CSharp {
                        bool old_do_flow_analysis = ec.DoFlowAnalysis;
                        if ((flags & ResolveFlags.DisableFlowAnalysis) != 0)
                                ec.DoFlowAnalysis = false;
-
+                       
                        Expression e;
-                       if (this is SimpleName)
-                               e = ((SimpleName) this).DoResolveAllowStatic (ec);
-                       else 
-                               e = DoResolve (ec);
-
-                       ec.DoFlowAnalysis = old_do_flow_analysis;
+                       try {
+                               if (this is SimpleName)
+                                       e = ((SimpleName) this).DoResolveAllowStatic (ec);
+                               else 
+                                       e = DoResolve (ec);
+                       } finally {
+                               ec.DoFlowAnalysis = old_do_flow_analysis;
+                       }
 
                        if (e == null)
                                return null;
@@ -316,17 +325,17 @@ namespace Mono.CSharp {
                                                ec.ContainerType, ec.ContainerType, AllMemberTypes,
                                                AllBindingFlags | BindingFlags.NonPublic, s.Name);
                                        if (lookup != null)
-                                               Error (122, "`" + s.Name + "' " +
+                                               Error (30390, "'" + s.Name + "' " +
                                                       "is inaccessible because of its protection level");
                                        else
-                                               Error (103, "The name `" + s.Name + "' could not be " +
-                                                      "found in `" + ec.DeclSpace.Name + "'");
+                                               Error (30451, "The name '" + s.Name + "' could not be " +
+                                                      "found in '" + ec.DeclSpace.Name + "'");
                                        return null;
                                }
 
                                return s;
                        }
-
+                       
                        if ((e is TypeExpr) || (e is ComposedCast)) {
                                if ((flags & ResolveFlags.Type) == 0) {
                                        e.Error118 (flags);
@@ -346,8 +355,12 @@ namespace Mono.CSharp {
 
                        case ExprClass.MethodGroup:
                                if ((flags & ResolveFlags.MethodGroup) == 0) {
-                                       ((MethodGroupExpr) e).ReportUsageError ();
-                                       return null;
+                                       MethodGroupExpr mg = (MethodGroupExpr) e;
+                                       Invocation i = new Invocation (mg, new ArrayList(), Location.Null);
+                                       Expression te = i.Resolve(ec);
+                                       //((MethodGroupExpr) e).ReportUsageError ();
+                                       //return null;
+                                       return te;
                                }
                                break;
 
@@ -401,8 +414,8 @@ namespace Mono.CSharp {
                                        SimpleName s = (SimpleName) e;
 
                                        Report.Error (
-                                               103, loc,
-                                               "The name `" + s.Name + "' could not be found in `" +
+                                               30451, loc,
+                                               "The name '" + s.Name + "' could not be found in '" +
                                                ec.DeclSpace.Name + "'");
                                        return null;
                                }
@@ -412,8 +425,12 @@ namespace Mono.CSharp {
                                                             " ExprClass is Invalid after resolve");
 
                                if (e.eclass == ExprClass.MethodGroup) {
-                                       ((MethodGroupExpr) e).ReportUsageError ();
-                                       return null;
+                                       MethodGroupExpr mg = (MethodGroupExpr) e;
+                                       Invocation i = new Invocation (mg, new ArrayList(), Location.Null);
+                                       Expression te = i.Resolve(ec);
+                                       return te;
+                                       //((MethodGroupExpr) e).ReportUsageError ();
+                                       //return null;
                                }
 
                                if (e.type == null)
@@ -505,7 +522,7 @@ namespace Mono.CSharp {
                        else if (mi is FieldInfo)
                                return new FieldExpr ((FieldInfo) mi, loc);
                        else if (mi is PropertyInfo)
-                               return new PropertyExpr ((PropertyInfo) mi, loc);
+                               return new PropertyExpr (ec, (PropertyInfo) mi, loc);
                        else if (mi is Type){
                                return new TypeExpr ((System.Type) mi, loc);
                        }
@@ -517,7 +534,7 @@ namespace Mono.CSharp {
                // FIXME: Probably implement a cache for (t,name,current_access_set)?
                //
                // This code could use some optimizations, but we need to do some
-               // measurements.  For example, we could use a delegate to `flag' when
+               // measurements.  For example, we could use a delegate to 'flag' when
                // something can not any longer be a method-group (because it is something
                // else).
                //
@@ -529,7 +546,7 @@ namespace Mono.CSharp {
                //
                //     null on error.
                //
-               // FIXME: When calling MemberLookup inside an `Invocation', we should pass
+               // FIXME: When calling MemberLookup inside an 'Invocation', we should pass
                // the arguments here and have MemberLookup return only the methods that
                // match the argument count/type, unlike we are doing now (we delay this
                // decision).
@@ -548,10 +565,10 @@ namespace Mono.CSharp {
                }
 
                //
-               // Lookup type `t' for code in class `invocation_type'.  Note that it's important
-               // to set `invocation_type' correctly since this method also checks whether the
-               // invoking class is allowed to access the member in class `t'.  When you want to
-               // explicitly do a lookup in the base class, you must set both `t' and `invocation_type'
+               // Lookup type 't' for code in class 'invocation_type'.  Note that it's important
+               // to set 'invocation_type' correctly since this method also checks whether the
+               // invoking class is allowed to access the member in class 't'.  When you want to
+               // explicitly do a lookup in the base class, you must set both 't' and 'invocation_type'
                // to the base class (although a derived class can access protected members of its base
                // class it cannot do so through an instance of the base class (error CS1540)).
                // 
@@ -587,12 +604,12 @@ namespace Mono.CSharp {
                public const BindingFlags AllBindingFlags =
                        BindingFlags.Public |
                        BindingFlags.Static |
-                       BindingFlags.Instance;
+                       BindingFlags.Instance |
+                       BindingFlags.IgnoreCase;
 
                public static Expression MemberLookup (EmitContext ec, Type t, string name, Location loc)
                {
-                       return MemberLookup (ec, ec.ContainerType, t, name,
-                                            AllMemberTypes, AllBindingFlags, loc);
+                       return MemberLookup (ec, ec.ContainerType, t, name, AllMemberTypes, AllBindingFlags, loc);
                }
 
                public static Expression MethodLookup (EmitContext ec, Type t, string name, Location loc)
@@ -633,12 +650,12 @@ namespace Mono.CSharp {
                                          AllBindingFlags | BindingFlags.NonPublic, loc);
                        if (e == null){
                                Report.Error (
-                                       117, loc, "`" + t + "' does not contain a definition " +
-                                       "for `" + name + "'");
+                                       30456, loc, "'" + t + "' does not contain a definition " +
+                                       "for '" + name + "'");
                        } else {
-                               Report.Error (
-                                       122, loc, "`" + t + "." + name +
-                                       "' is inaccessible due to its protection level");
+                                       Report.Error (
+                                               30390, loc, "'" + t + "." + name +
+                                               "' is inaccessible due to its protection level");
                        }
                        
                        return null;
@@ -661,8 +678,12 @@ namespace Mono.CSharp {
 
                                expr.Emit (null);
                        }
-                       
-                       if (target_type == TypeManager.object_type) {
+
+                       //
+                       // notice that it is possible to write "ValueType v = 1", the ValueType here
+                       // is an abstract class, and not really a value type, so we apply the same rules.
+                       //
+                       if (target_type == TypeManager.object_type || target_type == TypeManager.value_type) {
                                //
                                // A pointer type cannot be converted to object
                                // 
@@ -674,6 +695,14 @@ namespace Mono.CSharp {
                                if (expr_type.IsClass || expr_type.IsInterface)
                                        return new EmptyCast (expr, target_type);
                        } else if (expr_type.IsSubclassOf (target_type)) {
+                               //
+                               // Special case: enumeration to System.Enum.
+                               // System.Enum is not a value type, it is a class, so we need
+                               // a boxing conversion
+                               //
+                               if (expr_type.IsEnum)
+                                       return new BoxedCast (expr);
+                       
                                return new EmptyCast (expr, target_type);
                        } else {
 
@@ -687,16 +716,17 @@ namespace Mono.CSharp {
                                        return new EmptyCast (expr, target_type);
 
                                // from any class-type S to any interface-type T.
-                               if (expr_type.IsClass && target_type.IsInterface) {
-                                       if (TypeManager.ImplementsInterface (expr_type, target_type))
-                                               return new EmptyCast (expr, target_type);
-                                       else
-                                               return null;
+                               if (target_type.IsInterface) {
+                                       if (TypeManager.ImplementsInterface (expr_type, target_type)){
+                                               if (expr_type.IsClass)
+                                                       return new EmptyCast (expr, target_type);
+                                               else if (expr_type.IsValueType)
+                                                       return new BoxedCast (expr);
+                                       }
                                }
 
                                // from any interface type S to interface-type T.
                                if (expr_type.IsInterface && target_type.IsInterface) {
-
                                        if (TypeManager.ImplementsInterface (expr_type, target_type))
                                                return new EmptyCast (expr, target_type);
                                        else
@@ -744,21 +774,6 @@ namespace Mono.CSharp {
                        return null;
                }
 
-               /// <summary>
-               ///   Handles expressions like this: decimal d; d = 1;
-               ///   and changes them into: decimal d; d = new System.Decimal (1);
-               /// </summary>
-               static Expression InternalTypeConstructor (EmitContext ec, Expression expr, Type target)
-               {
-                       ArrayList args = new ArrayList ();
-
-                       args.Add (new Argument (expr, Argument.AType.Expression));
-
-                       Expression ne = new New (new TypeExpr (target, Location.Null), args, Location.Null);
-
-                       return ne.Resolve (ec);
-               }
-
                /// <summary>
                ///   Implicit Numeric Conversions.
                ///
@@ -791,20 +806,35 @@ namespace Mono.CSharp {
                                        return new ULongConstant ((ulong) v);
                        }
 
-                       //
-                       // If we have an enumeration, extract the underlying type,
-                       // use this during the comparission, but wrap around the original
-                       // target_type
-                       //
-                       Type real_target_type = target_type;
+                       Type real_target_type = target_type;
 
-                       if (TypeManager.IsEnumType (real_target_type))
-                               real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+                       if (target_type == TypeManager.bool_type) {
 
-                       if (expr_type == real_target_type)
-                               return new EmptyCast (expr, target_type);
-                       
-                       if (expr_type == TypeManager.sbyte_type){
+                               if (expr_type == TypeManager.decimal_type) {
+                                       return RTConversionExpression (ec, "System.Convert", ".ToBoolean" , expr, loc);
+                               }
+                               return new NumericToBoolCast (expr, expr.Type);
+                       }
+
+                       if (expr_type == TypeManager.bool_type){
+                               //
+                               if (real_target_type == TypeManager.sbyte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (real_target_type == TypeManager.byte_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (real_target_type == TypeManager.int32_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                               if (real_target_type == TypeManager.int64_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                               if (real_target_type == TypeManager.double_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+                               if (real_target_type == TypeManager.float_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                               if (real_target_type == TypeManager.short_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                               if (real_target_type == TypeManager.decimal_type)
+                                       return RTConversionExpression(ec, "System.Convert", ".ToDecimal", expr, loc);
+                       } else if (expr_type == TypeManager.sbyte_type){
                                //
                                // From sbyte to short, int, long, float, double.
                                //
@@ -818,8 +848,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
                                if (real_target_type == TypeManager.short_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.byte_type){
                                //
                                // From byte to short, ushort, int, uint, long, ulong, float, double
@@ -838,8 +866,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
                                if (real_target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.short_type){
                                //
                                // From short to int, long, float, double
@@ -852,8 +878,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.ushort_type){
                                //
                                // From ushort to int, uint, long, ulong, float, double
@@ -871,8 +895,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.int32_type){
                                //
                                // From int to long, float, double
@@ -883,8 +905,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.uint32_type){
                                //
                                // From uint to long, ulong, float, double
@@ -899,8 +919,6 @@ namespace Mono.CSharp {
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
                                                               OpCodes.Conv_R4);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.int64_type){
                                //
                                // From long/ulong to float, double
@@ -909,8 +927,6 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);     
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.uint64_type){
                                //
                                // From ulong to float, double
@@ -921,8 +937,6 @@ namespace Mono.CSharp {
                                if (real_target_type == TypeManager.float_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
                                                               OpCodes.Conv_R4);        
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.char_type){
                                //
                                // From char to ushort, int, uint, long, ulong, float, double
@@ -939,15 +953,44 @@ namespace Mono.CSharp {
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
                                if (real_target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+                       } else if (expr_type == TypeManager.string_type){
+
+                               if (real_target_type == TypeManager.bool_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
                                if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
+                                       return RTConversionExpression (ec, "System.Convert", ".ToDecimal" , expr, loc);
                        } else if (expr_type == TypeManager.float_type){
                                //
                                // float to double
                                //
+                               if (real_target_type == TypeManager.decimal_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToDecimal" , expr, loc);
                                if (real_target_type == TypeManager.double_type)
                                        return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
-                       }
+
+                       } else if (expr_type == TypeManager.double_type){
+
+                               if (real_target_type == TypeManager.decimal_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToDecimal" , expr, loc);
+                       } else if (expr_type == TypeManager.decimal_type){
+
+                               if (real_target_type == TypeManager.bool_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToBoolean" , expr, loc);
+                               if (real_target_type == TypeManager.short_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToInt16" , expr, loc);
+                               if (real_target_type == TypeManager.byte_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToByte" , expr, loc);
+                               if (real_target_type == TypeManager.int32_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToInt32" , expr, loc);
+                               if (real_target_type == TypeManager.int64_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToInt64" , expr, loc);
+                               if (real_target_type == TypeManager.float_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToSingle" , expr, loc);
+                               if (real_target_type == TypeManager.double_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToDouble" , expr, loc);
+                               if (real_target_type == TypeManager.char_type)
+                                       return RTConversionExpression (ec, "System.Convert", ".ToString" , expr, loc);
+                       }
 
                        return null;
                }
@@ -956,10 +999,8 @@ namespace Mono.CSharp {
                // Tests whether an implicit reference conversion exists between expr_type
                // and target_type
                //
-               public static bool ImplicitReferenceConversionExists (Expression expr, Type target_type)
+               public static bool ImplicitReferenceConversionExists (Expression expr, Type expr_type, Type target_type)
                {
-                       Type expr_type = expr.Type;
-                       
                        //
                        // This is the boxed case.
                        //
@@ -971,13 +1012,12 @@ namespace Mono.CSharp {
                                
                        } else if (expr_type.IsSubclassOf (target_type)) {
                                return true;
-                               
                        } else {
                                // Please remember that all code below actually comes
                                // from ImplicitReferenceConversion so make sure code remains in sync
                                
                                // from any class-type S to any interface-type T.
-                               if (expr_type.IsClass && target_type.IsInterface) {
+                               if (target_type.IsInterface) {
                                        if (TypeManager.ImplementsInterface (expr_type, target_type))
                                                return true;
                                }
@@ -1040,30 +1080,53 @@ namespace Mono.CSharp {
                        if (StandardConversionExists (expr, target_type) == true)
                                return true;
 
+#if false
                        Expression dummy = ImplicitUserConversion (ec, expr, target_type, Location.Null);
 
                        if (dummy != null)
                                return true;
+#endif
 
                        return false;
                }
-               
+
                /// <summary>
                ///  Determines if a standard implicit conversion exists from
                ///  expr_type to target_type
                /// </summary>
                public static bool StandardConversionExists (Expression expr, Type target_type)
                {
-                       Type expr_type = expr.Type;
+                       return WideningConversionExists (expr, expr.type, target_type);
+               }
+
+               public static bool WideningConversionExists (Type expr_type, Type target_type)
+               {
+                       return WideningConversionExists (null, expr_type, target_type);
+               }
+
+               public static bool WideningConversionExists (Expression expr, Type target_type)
+               {
+                       return WideningConversionExists (expr, expr.Type, target_type);
+               }
 
-                       if (expr_type == TypeManager.void_type)
+               public static bool WideningConversionExists (Expression expr, Type expr_type, Type target_type)
+               {
+
+                       if (expr_type == null || expr_type == TypeManager.void_type)
                                return false;
                        
                        if (expr_type == target_type)
                                return true;
 
-                       // First numeric conversions 
+                       // Conversions from enum to underlying type are widening.
+                       if (expr_type.IsSubclassOf (TypeManager.enum_type))
+                               expr_type = TypeManager.EnumToUnderlying (expr_type);
 
+                       if (expr_type == target_type)
+                               return true;
+
+                       // First numeric conversions 
+                       
                        if (expr_type == TypeManager.sbyte_type){
                                //
                                // From sbyte to short, int, long, float, double.
@@ -1081,6 +1144,7 @@ namespace Mono.CSharp {
                                // From byte to short, ushort, int, uint, long, ulong, float, double
                                // 
                                if ((target_type == TypeManager.short_type) ||
+                                   (target_type == TypeManager.bool_type) ||
                                    (target_type == TypeManager.ushort_type) ||
                                    (target_type == TypeManager.int32_type) ||
                                    (target_type == TypeManager.uint32_type) ||
@@ -1096,6 +1160,7 @@ namespace Mono.CSharp {
                                // From short to int, long, float, double
                                // 
                                if ((target_type == TypeManager.int32_type) ||
+                                   (target_type == TypeManager.bool_type) ||
                                    (target_type == TypeManager.int64_type) ||
                                    (target_type == TypeManager.double_type) ||
                                    (target_type == TypeManager.float_type) ||
@@ -1120,6 +1185,7 @@ namespace Mono.CSharp {
                                // From int to long, float, double
                                //
                                if ((target_type == TypeManager.int64_type) ||
+                                   (target_type == TypeManager.bool_type) ||
                                    (target_type == TypeManager.double_type) ||
                                    (target_type == TypeManager.float_type) ||
                                    (target_type == TypeManager.decimal_type))
@@ -1130,6 +1196,7 @@ namespace Mono.CSharp {
                                // From uint to long, ulong, float, double
                                //
                                if ((target_type == TypeManager.int64_type) ||
+                                   (target_type == TypeManager.bool_type) ||
                                    (target_type == TypeManager.uint64_type) ||
                                    (target_type == TypeManager.double_type) ||
                                    (target_type == TypeManager.float_type) ||
@@ -1142,6 +1209,7 @@ namespace Mono.CSharp {
                                // From long/ulong to float, double
                                //
                                if ((target_type == TypeManager.double_type) ||
+                                   (target_type == TypeManager.bool_type) ||
                                    (target_type == TypeManager.float_type) ||
                                    (target_type == TypeManager.decimal_type))
                                        return true;
@@ -1162,13 +1230,17 @@ namespace Mono.CSharp {
 
                        } else if (expr_type == TypeManager.float_type){
                                //
-                               // float to double
+                               // float to double, decimal
                                //
                                if (target_type == TypeManager.double_type)
                                        return true;
-                       }       
+                       } else if (expr_type == TypeManager.double_type){
+
+                               if ((target_type == TypeManager.bool_type))
+                                       return true;
+                       }               
                        
-                       if (ImplicitReferenceConversionExists (expr, target_type))
+                       if (ImplicitReferenceConversionExists (expr, expr_type, target_type))
                                return true;
                        
                        if (expr is IntConstant){
@@ -1221,6 +1293,9 @@ namespace Mono.CSharp {
                                        return true;
                        }
 
+                       if (target_type == TypeManager.void_ptr_type && expr_type.IsPointer)
+                               return true;
+
                        return false;
                }
 
@@ -1300,7 +1375,7 @@ namespace Mono.CSharp {
                ///   by making use of FindMostEncomp* methods. Applies the correct rules separately
                ///   for explicit and implicit conversion operators.
                /// </summary>
-               static public Type FindMostSpecificSource (MethodGroupExpr me, Type source_type,
+               static public Type FindMostSpecificSource (MethodGroupExpr me, Expression source,
                                                           bool apply_explicit_conv_rules,
                                                           Location loc)
                {
@@ -1308,10 +1383,11 @@ namespace Mono.CSharp {
                        
                        if (priv_fms_expr == null)
                                priv_fms_expr = new EmptyExpression ();
-                       
+
                        //
                        // If any operator converts from S then Sx = S
                        //
+                       Type source_type = source.Type;
                        foreach (MethodBase mb in me.Methods){
                                ParameterData pd = Invocation.GetParameterData (mb);
                                Type param_type = pd.ParameterType (0);
@@ -1332,16 +1408,14 @@ namespace Mono.CSharp {
                                        if (StandardConversionExists (priv_fms_expr, source_type))
                                                src_types_set.Add (param_type);
                                        else {
-                                               priv_fms_expr.SetType (source_type);
-                                               if (StandardConversionExists (priv_fms_expr, param_type))
+                                               if (StandardConversionExists (source, param_type))
                                                        src_types_set.Add (param_type);
                                        }
                                } else {
                                        //
                                        // Only if S is encompassed by param_type
                                        //
-                                       priv_fms_expr.SetType (source_type);
-                                       if (StandardConversionExists (priv_fms_expr, param_type))
+                                       if (StandardConversionExists (source, param_type))
                                                src_types_set.Add (param_type);
                                }
                        }
@@ -1353,9 +1427,7 @@ namespace Mono.CSharp {
                                ArrayList candidate_set = new ArrayList ();
 
                                foreach (Type param_type in src_types_set){
-                                       priv_fms_expr.SetType (source_type);
-                                       
-                                       if (StandardConversionExists (priv_fms_expr, param_type))
+                                       if (StandardConversionExists (source, param_type))
                                                candidate_set.Add (param_type);
                                }
 
@@ -1448,7 +1520,7 @@ namespace Mono.CSharp {
                        //
                        if (apply_explicit_conv_rules)
                                return FindMostEncompassedType (tgt_types_set);
-                       else
+                       else 
                                return FindMostEncompassingType (tgt_types_set);
                }
                
@@ -1472,7 +1544,7 @@ namespace Mono.CSharp {
 
                /// <summary>
                ///   Computes the MethodGroup for the user-defined conversion
-               ///   operators from source_type to target_type.  `look_for_explicit'
+               ///   operators from source_type to target_type.  'look_for_explicit'
                ///   controls whether we should also include the list of explicit
                ///   operators
                /// </summary>
@@ -1570,14 +1642,14 @@ namespace Mono.CSharp {
                        }
 #endif
                        
-                       most_specific_source = FindMostSpecificSource (union, source_type, look_for_explicit, loc);
+                       most_specific_source = FindMostSpecificSource (union, source, look_for_explicit, loc);
                        if (most_specific_source == null)
                                return null;
 
                        most_specific_target = FindMostSpecificTarget (union, target, look_for_explicit, loc);
                        if (most_specific_target == null) 
                                return null;
-                       
+
                        int count = 0;
 
                        foreach (MethodBase mb in union.Methods){
@@ -1591,10 +1663,9 @@ namespace Mono.CSharp {
                                }
                        }
                        
-                       if (method == null || count > 1) {
-                               Report.Error (-11, loc, "Ambiguous user defined conversion");
+                       if (method == null || count > 1)
                                return null;
-                       }
+                       
                        
                        //
                        // This will do the conversion to the best match that we
@@ -1622,9 +1693,9 @@ namespace Mono.CSharp {
                }
                
                /// <summary>
-               ///   Converts implicitly the resolved expression `expr' into the
-               ///   `target_type'.  It returns a new expression that can be used
-               ///   in a context that expects a `target_type'. 
+               ///   Converts implicitly the resolved expression 'expr' into the
+               ///   'target_type'.  It returns a new expression that can be used
+               ///   in a context that expects a 'target_type'. 
                /// </summary>
                static public Expression ConvertImplicit (EmitContext ec, Expression expr,
                                                          Type target_type, Location loc)
@@ -1632,6 +1703,7 @@ namespace Mono.CSharp {
                        Type expr_type = expr.Type;
                        Expression e;
 
+
                        if (expr_type == target_type)
                                return expr;
 
@@ -1641,23 +1713,390 @@ namespace Mono.CSharp {
                        e = ConvertImplicitStandard (ec, expr, target_type, loc);
                        if (e != null)
                                return e;
-
+                                       
                        e = ImplicitUserConversion (ec, expr, target_type, loc);
+                       
                        if (e != null)
                                return e;
+                               
+                       e = NarrowingConversion (ec, expr, target_type, loc);
+                       if (e != null)
+                               return e;                               
 
                        return null;
                }
 
+               /// <summary>
+               ///   Converts the resolved expression 'expr' into the
+               ///   'target_type' using the Microsoft.VisualBasic runtime.
+               ///   It returns a new expression that can be used
+               ///   in a context that expects a 'target_type'. 
+               /// </summary>
+               static private Expression RTConversionExpression (EmitContext ec, string s, Expression expr, Location loc)
+               {
+                       Expression etmp, e;
+                       ArrayList args;
+                       Argument arg;
+                       
+                       etmp = Mono.MonoBASIC.Parser.DecomposeQI("Microsoft.VisualBasic.CompilerServices." + s, loc);
+                       args = new ArrayList();
+                       arg = new Argument (expr, Argument.AType.Expression);
+                       args.Add (arg);
+                       e = (Expression) new Invocation (etmp, args, loc);
+                       e = e.Resolve(ec);      
+                       return (e);             
+               }
+
+               static private Expression RTConversionExpression (EmitContext ec, string ns, string method, Expression expr, Location loc)
+               {
+                       Expression etmp, e;
+                       ArrayList args;
+                       Argument arg;
+                       
+                       etmp = Mono.MonoBASIC.Parser.DecomposeQI(ns+method, loc);
+                       args = new ArrayList();
+                       arg = new Argument (expr, Argument.AType.Expression);
+                       args.Add (arg);
+                       e = (Expression) new Invocation (etmp, args, loc);
+                       e = e.Resolve(ec);      
+                       return (e);             
+               }
+
+               
+               static public bool NarrowingConversionExists (EmitContext ec, Expression expr, Type target_type)
+               {
+                       Type expr_type = expr.Type;
+
+                       if (target_type == TypeManager.sbyte_type){
+                               //
+                               // To sbyte from short, int, long, float, double.
+                               //
+                               if ((expr_type == TypeManager.int32_type) || 
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type)  ||
+                                   (expr_type == TypeManager.short_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                               
+                       } else if (target_type == TypeManager.byte_type){
+                               //
+                               // To byte from short, ushort, int, uint, long, ulong, float, double
+                               // 
+                               if ((expr_type == TypeManager.short_type) ||
+                                   (expr_type == TypeManager.ushort_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+       
+                       } else if (target_type == TypeManager.short_type){
+                               //
+                               // To short from int, long, float, double
+                               // 
+                               if ((expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                                       
+                       } else if (target_type == TypeManager.ushort_type){
+                               //
+                               // To ushort from int, uint, long, ulong, float, double
+                               //
+                               if ((expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                                   
+                       } else if (target_type == TypeManager.int32_type){
+                               //
+                               // To int from long, float, double
+                               //
+                               if ((expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                                       
+                       } else if (target_type == TypeManager.uint32_type){
+                               //
+                               // To uint from long, ulong, float, double
+                               //
+                               if ((expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                                       
+                       } else if ((target_type == TypeManager.uint64_type) ||
+                                  (target_type == TypeManager.int64_type)) {
+                               //
+                               // To long/ulong from float, double
+                               //
+                               if ((expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+                                   
+                       } else if (target_type == TypeManager.char_type){
+                               //
+                               // To char from ushort, int, uint, long, ulong, float, double
+                               // 
+                               if ((expr_type == TypeManager.ushort_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return true;
+
+                       } else if (target_type == TypeManager.float_type){
+                               //
+                               // To float from double
+                               //
+                               if (expr_type == TypeManager.double_type)
+                                       return true;
+                       }       
+
+                       return (NarrowingConversion (ec, expr, target_type,Location.Null)) != null;     
+               }
                
+               static public Expression NarrowingConversion (EmitContext ec, Expression expr,
+                                                               Type target_type, Location loc)
+               {
+                       Type expr_type = expr.Type;
+
+                       if (target_type == TypeManager.sbyte_type){
+                               //
+                               // To sbyte from short, int, long, float, double.
+                               //
+                               if ((expr_type == TypeManager.int32_type) || 
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type)  ||
+                                   (expr_type == TypeManager.short_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I1);
+                               
+                       } else if (target_type == TypeManager.byte_type){
+                               //
+                               // To byte from short, ushort, int, uint, long, ulong, float, double
+                               // 
+                               if ((expr_type == TypeManager.short_type) ||
+                                   (expr_type == TypeManager.ushort_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U1);
+       
+                       } else if (target_type == TypeManager.short_type){
+                               //
+                               // To short from int, long, float, double
+                               // 
+                               if ((expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+                                       
+                       } else if (target_type == TypeManager.ushort_type){
+                               //
+                               // To ushort from int, uint, long, ulong, float, double
+                               //
+                               if ((expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+                                   
+                       } else if (target_type == TypeManager.int32_type){
+                               //
+                               // To int from long, float, double
+                               //
+                               if ((expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+                                       
+                       } else if (target_type == TypeManager.uint32_type){
+                               //
+                               // To uint from long, ulong, float, double
+                               //
+                               if ((expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U4);
+                                       
+                       } else if ((target_type == TypeManager.uint64_type) ||
+                                  (target_type == TypeManager.int64_type)) {
+                               //
+                               // To long/ulong from float, double
+                               //
+                               if ((expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+                                   
+                       } else if (target_type == TypeManager.char_type){
+                               //
+                               // To char from ushort, int, uint, long, ulong, float, double
+                               // 
+                               if ((expr_type == TypeManager.ushort_type) ||
+                                   (expr_type == TypeManager.int32_type) ||
+                                   (expr_type == TypeManager.uint32_type) ||
+                                   (expr_type == TypeManager.uint64_type) ||
+                                   (expr_type == TypeManager.int64_type) ||
+                                   (expr_type == TypeManager.float_type) ||
+                                   (expr_type == TypeManager.double_type) ||
+                                   (expr_type == TypeManager.decimal_type))
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_U2);
+
+                       } else if (target_type == TypeManager.float_type){
+                               //
+                               // To float from double
+                               //
+                               if (expr_type == TypeManager.double_type)
+                                       return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+                       }       
+
+                       TypeCode dest_type = Type.GetTypeCode (target_type);
+                       TypeCode src_type = Type.GetTypeCode (expr_type);
+                       Expression e = null;
+
+                       // VB.NET Objects can be converted to anything by default
+                       // unless, that is, an exception at runtime blows it all
+                       if (src_type == TypeCode.Object) {
+                               Expression cast_type = Mono.MonoBASIC.Parser.DecomposeQI(target_type.ToString(), loc);
+                               Cast ce = new Cast (cast_type, expr, loc);
+                               ce.IsRuntimeCast = true;
+                               return ce.Resolve (ec);
+                       }
+
+                       switch (dest_type) {
+                               case TypeCode.String:
+                                       switch (src_type) {
+                                               case TypeCode.SByte:                                            
+                                               case TypeCode.Byte:
+                                                       e = RTConversionExpression(ec, "StringType.FromByte", expr, loc);
+                                                       break;  
+                                               case TypeCode.UInt16:
+                                               case TypeCode.Int16:
+                                                       e = RTConversionExpression(ec, "StringType.FromShort", expr, loc);
+                                                       break;          
+                                               case TypeCode.UInt32:                                   
+                                               case TypeCode.Int32:
+                                                       e = RTConversionExpression(ec, "StringType.FromInteger", expr, loc);
+                                                       break;                                                  
+                                               case TypeCode.UInt64:   
+                                               case TypeCode.Int64:
+                                                       e = RTConversionExpression(ec, "StringType.FromLong", expr, loc);
+                                                       break;                                                  
+                                               case TypeCode.Char:
+                                                       e = RTConversionExpression(ec, "StringType.FromChar", expr, loc);
+                                                       break;                                                          
+                                               case TypeCode.Single:
+                                                       e = RTConversionExpression(ec, "StringType.FromSingle", expr, loc);
+                                                       break;          
+                                               case TypeCode.Double:
+                                                       e = RTConversionExpression(ec, "StringType.FromDouble", expr, loc);
+                                                       break;                                                                                                                                                  
+                                               case TypeCode.Boolean:
+                                                       e = RTConversionExpression(ec, "StringType.FromBoolean", expr, loc);
+                                                       break;  
+                                               case TypeCode.DateTime:
+                                                       e = RTConversionExpression(ec, "StringType.FromDate", expr, loc);
+                                                       break;          
+                                               case TypeCode.Decimal:
+                                                       e = RTConversionExpression(ec, "StringType.FromDecimal", expr, loc);
+                                                       break;          
+                                               case TypeCode.Object:
+                                                       e = RTConversionExpression(ec, "StringType.FromObject", expr, loc);
+                                                       break;                                                                                                                                                                                                                          
+                                       }
+                                       break;
+                                       
+                               case TypeCode.Int32:
+                               case TypeCode.UInt32:   
+                                       switch (src_type) {                                             
+                                               case TypeCode.String:                           
+                                                       e = RTConversionExpression(ec, "IntegerType.FromString", expr, loc);
+                                                       break;          
+                                               case TypeCode.Object:                           
+                                                       e = RTConversionExpression(ec, "IntegerType.FromObject", expr, loc);
+                                                       break;                                                                                  
+                                       }
+                                       break;  
+
+                               case TypeCode.Int16:
+                               case TypeCode.UInt16:   
+                                       switch (src_type) {                                             
+                                               case TypeCode.String:                           
+                                                       e = RTConversionExpression(ec, "ShortType.FromString", expr, loc);
+                                                       break;          
+                                               case TypeCode.Object:                           
+                                                       e = RTConversionExpression(ec, "ShortType.FromObject", expr, loc);
+                                                       break;                                                                                  
+                                       }
+                                       break;  
+                               case TypeCode.Byte:
+                                       // Ok, this *is* broken
+                                       e = RTConversionExpression(ec, "ByteType.FromObject", expr, loc);
+                                       break;  
+                               case TypeCode.DateTime: 
+                                       switch (src_type) {                                             
+                                               case TypeCode.String:                           
+                                                       e = RTConversionExpression(ec, "DateType.FromString", expr, loc);
+                                                       break;          
+                                               case TypeCode.Object:                           
+                                                       e = RTConversionExpression(ec, "DateType.FromObject", expr, loc);
+                                                       break;                                                                                  
+                                       }
+                                       break;                                                                                                          
+                       }
+                       
+                       // We must examine separately some types that
+                       // don't have a TypeCode but are supported 
+                       // in the runtime
+                       if (expr_type == typeof(System.String) && target_type == typeof (System.Char[])) {
+                               e = RTConversionExpression(ec, "CharArrayType.FromString", expr, loc);
+                       }
+                       
+                       return e;
+               }
+                                                                                               
                /// <summary>
-               ///   Attempts to apply the `Standard Implicit
-               ///   Conversion' rules to the expression `expr' into
-               ///   the `target_type'.  It returns a new expression
+               ///   Attempts to apply the 'Standard Implicit
+               ///   Conversion' rules to the expression 'expr' into
+               ///   the 'target_type'.  It returns a new expression
                ///   that can be used in a context that expects a
-               ///   `target_type'.
+               ///   'target_type'.
                ///
-               ///   This is different from `ConvertImplicit' in that the
+               ///   This is different from 'ConvertImplicit' in that the
                ///   user defined implicit conversions are excluded. 
                /// </summary>
                static public Expression ConvertImplicitStandard (EmitContext ec, Expression expr,
@@ -1670,6 +2109,7 @@ namespace Mono.CSharp {
                                return expr;
 
                        e = ImplicitNumericConversion (ec, expr, target_type, loc);
+
                        if (e != null)
                                return e;
 
@@ -1677,11 +2117,14 @@ namespace Mono.CSharp {
                        if (e != null)
                                return e;
 
-                       if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
-                               IntLiteral i = (IntLiteral) expr;
-
-                               if (i.Value == 0)
-                                       return new EmptyCast (expr, target_type);
+                       if (expr.Type.IsSubclassOf (TypeManager.enum_type)) {
+                               expr_type = TypeManager.EnumToUnderlying (expr.Type);
+                               expr = new EmptyCast (expr, expr_type);
+                               if (expr_type == target_type)
+                                       return expr;
+                               e = ImplicitNumericConversion (ec, expr, target_type, loc);
+                               if (e != null)
+                                       return e;
                        }
 
                        if (ec.InUnsafe) {
@@ -1745,23 +2188,37 @@ namespace Mono.CSharp {
                                        return new ULongConstant ((ulong) value);
                        }
                        
-                       if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type))
-                               return new EnumConstant (ic, target_type);
-
+                       if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type)){
+                               Type underlying = TypeManager.EnumToUnderlying (target_type);
+                               Constant e = (Constant) ic;
+                               
+                               //
+                               // Possibly, we need to create a different 0 literal before passing
+                               // to EnumConstant
+                               //n
+                               if (underlying == TypeManager.int64_type)
+                                       e = new LongLiteral (0);
+                               else if (underlying == TypeManager.uint64_type)
+                                       e = new ULongLiteral (0);
+
+                               return new EnumConstant (e, target_type);
+                       }
                        return null;
                }
 
                static public void Error_CannotConvertImplicit (Location loc, Type source, Type target)
                {
-                       string msg = "Cannot convert implicitly from `"+
-                               TypeManager.CSharpName (source) + "' to `" +
-                               TypeManager.CSharpName (target) + "'";
+                       string msg = "Cannot convert implicitly from '"+
+                               TypeManager.MonoBASIC_Name (source) + "' to '" +
+                               TypeManager.MonoBASIC_Name (target) + "'";
+
+                       throw new Exception (msg);
 
                        Report.Error (29, loc, msg);
                }
 
                /// <summary>
-               ///   Attemptes to implicityly convert `target' into `type', using
+               ///   Attemptes to implicityly convert 'target' into 'type', using
                ///   ConvertImplicit.  If there is no implicit conversion, then
                ///   an error is signaled
                /// </summary>
@@ -1771,15 +2228,17 @@ namespace Mono.CSharp {
                        Expression e;
                        
                        e = ConvertImplicit (ec, source, target_type, loc);
+
                        if (e != null)
                                return e;
 
+
                        if (source is DoubleLiteral && target_type == TypeManager.float_type){
                                Report.Error (664, loc,
                                              "Double literal cannot be implicitly converted to " +
                                              "float type, use F suffix to create a float literal");
                        }
-                       
+
                        Error_CannotConvertImplicit (loc, source.Type, target_type);
 
                        return null;
@@ -1788,13 +2247,13 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Performs the explicit numeric conversions
                /// </summary>
-               static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type)
+               static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type, Location loc)
                {
                        Type expr_type = expr.Type;
 
                        //
                        // If we have an enumeration, extract the underlying type,
-                       // use this during the comparission, but wrap around the original
+                       // use this during the comparison, but wrap around the original
                        // target_type
                        //
                        Type real_target_type = target_type;
@@ -1802,6 +2261,14 @@ namespace Mono.CSharp {
                        if (TypeManager.IsEnumType (real_target_type))
                                real_target_type = TypeManager.EnumToUnderlying (real_target_type);
 
+                       if (StandardConversionExists (expr, real_target_type)){
+                               Expression ce = ConvertImplicitStandard (ec, expr, real_target_type, loc);
+
+                               if (real_target_type != target_type)
+                                       return new EmptyCast (ce, target_type);
+                               return ce;
+                       }
+                       
                        if (expr_type == TypeManager.sbyte_type){
                                //
                                // From sbyte to byte, ushort, uint, ulong, char
@@ -1960,8 +2427,6 @@ namespace Mono.CSharp {
                                        return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U8);
                                if (real_target_type == TypeManager.char_type)
                                        return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_CH);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } else if (expr_type == TypeManager.double_type){
                                //
                                // From double to byte, byte, short,
@@ -1988,8 +2453,6 @@ namespace Mono.CSharp {
                                        return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_CH);
                                if (real_target_type == TypeManager.float_type)
                                        return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_R4);
-                               if (real_target_type == TypeManager.decimal_type)
-                                       return InternalTypeConstructor (ec, expr, target_type);
                        } 
 
                        // decimal is taken care of by the op_Explicit methods.
@@ -2190,11 +2653,11 @@ namespace Mono.CSharp {
                }
                
                /// <summary>
-               ///   Performs an explicit conversion of the expression `expr' whose
-               ///   type is expr.Type to `target_type'.
+               ///   Performs an explicit conversion of the expression 'expr' whose
+               ///   type is expr.Type to 'target_type'.
                /// </summary>
                static public Expression ConvertExplicit (EmitContext ec, Expression expr,
-                                                         Type target_type, Location loc)
+                                                         Type target_type, bool runtimeconv, Location loc)
                {
                        Type expr_type = expr.Type;
                        Expression ne = ConvertImplicitStandard (ec, expr, target_type, loc);
@@ -2202,7 +2665,7 @@ namespace Mono.CSharp {
                        if (ne != null)
                                return ne;
 
-                       ne = ConvertNumericExplicit (ec, expr, target_type);
+                       ne = ConvertNumericExplicit (ec, expr, target_type, loc);
                        if (ne != null)
                                return ne;
 
@@ -2233,7 +2696,16 @@ namespace Mono.CSharp {
                                if (t != null)
                                        return t;
                                
-                               return ConvertNumericExplicit (ec, e, target_type);
+                               t = ConvertNumericExplicit (ec, e, target_type, loc);
+                               if (t != null)
+                                       return t;
+                               
+                               t = NarrowingConversion (ec, e, target_type, loc);
+                               if (t != null)
+                                       return t;       
+                                                               
+                               Error_CannotConvertType (loc, expr_type, target_type);
+                               return null;
                        }
                        
                        ne = ConvertReferenceExplicit (expr, target_type);
@@ -2272,7 +2744,7 @@ namespace Mono.CSharp {
                                                if (ci != null)
                                                        return ci;
 
-                                               ce = ConvertNumericExplicit (ec, e, target_type);
+                                               ce = ConvertNumericExplicit (ec, e, target_type, loc);
                                                if (ce != null)
                                                        return ce;
                                                //
@@ -2289,7 +2761,13 @@ namespace Mono.CSharp {
                        if (ne != null)
                                return ne;
 
-                       Error_CannotConvertType (loc, expr_type, target_type);
+                       if (!(runtimeconv))     {
+                               ne = NarrowingConversion (ec, expr, target_type, loc);
+                               if (ne != null)
+                                       return ne;
+                               
+                               Error_CannotConvertType (loc, expr_type, target_type);
+                       }
                        return null;
                }
 
@@ -2304,7 +2782,7 @@ namespace Mono.CSharp {
                        if (ne != null)
                                return ne;
 
-                       ne = ConvertNumericExplicit (ec, expr, target_type);
+                       ne = ConvertNumericExplicit (ec, expr, target_type, l);
                        if (ne != null)
                                return ne;
 
@@ -2312,6 +2790,10 @@ namespace Mono.CSharp {
                        if (ne != null)
                                return ne;
 
+                       ne = NarrowingConversion (ec, expr, target_type, l);
+                       if (ne != null)
+                               return ne;                              
+
                        Error_CannotConvertType (l, expr.Type, target_type);
                        return null;
                }
@@ -2344,7 +2826,7 @@ namespace Mono.CSharp {
                }
                
                /// <summary>
-               ///   Reports that we were expecting `expr' to be of class `expected'
+               ///   Reports that we were expecting 'expr' to be of class 'expected'
                /// </summary>
                public void Error118 (string expected)
                {
@@ -2352,8 +2834,8 @@ namespace Mono.CSharp {
                        
                        kind = ExprClassName (eclass);
 
-                       Error (118, "Expression denotes a `" + kind +
-                              "' where a `" + expected + "' was expected");
+                       Error (118, "Expression denotes a '" + kind +
+                              "' where a '" + expected + "' was expected");
                }
 
                public void Error118 (ResolveFlags flags)
@@ -2388,14 +2870,14 @@ namespace Mono.CSharp {
 
                        string kind = ExprClassName (eclass);
 
-                       Error (119, "Expression denotes a `" + kind + "' where " +
-                              "a `" + sb.ToString () + "' was expected");
+                       Error (119, "Expression denotes a '" + kind + "' where " +
+                              "a '" + sb.ToString () + "' was expected");
                }
                
                static void Error_ConstantValueCannotBeConverted (Location l, string val, Type t)
                {
-                       Report.Error (31, l, "Constant value `" + val + "' cannot be converted to " +
-                                     TypeManager.CSharpName (t));
+                       Report.Error (31, l, "Constant value '" + val + "' cannot be converted to " +
+                                     TypeManager.MonoBASIC_Name (t));
                }
 
                public static void UnsafeError (Location loc)
@@ -2406,7 +2888,7 @@ namespace Mono.CSharp {
                /// <summary>
                ///   Converts the IntConstant, UIntConstant, LongConstant or
                ///   ULongConstant into the integral target_type.   Notice
-               ///   that we do not return an `Expression' we do return
+               ///   that we do not return an 'Expression' we do return
                ///   a boxed integral type.
                ///
                ///   FIXME: Since I added the new constants, we need to
@@ -2715,11 +3197,11 @@ namespace Mono.CSharp {
                }
 
                //
-               // The stack contains the pointer and the value of type `type'
+               // The stack contains the pointer and the value of type 'type'
                //
                public static void StoreFromPtr (ILGenerator ig, Type type)
                {
-                       if (type.IsEnum)
+                       if (TypeManager.IsEnumType (type))
                                type = TypeManager.EnumToUnderlying (type);
                        if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
                                ig.Emit (OpCodes.Stind_I4);
@@ -2744,7 +3226,7 @@ namespace Mono.CSharp {
                }
                
                //
-               // Returns the size of type `t' if known, otherwise, 0
+               // Returns the size of type 't' if known, otherwise, 0
                //
                public static int GetTypeSize (Type t)
                {
@@ -2765,6 +3247,8 @@ namespace Mono.CSharp {
                                 t == TypeManager.char_type ||
                                 t == TypeManager.ushort_type)
                                return 2;
+                       else if (t == TypeManager.decimal_type)
+                               return 16;
                        else
                                return 0;
                }
@@ -2782,7 +3266,7 @@ namespace Mono.CSharp {
                }
                
                //
-               // Converts `source' to an int, uint, long or ulong.
+               // Converts 'source' to an int, uint, long or ulong.
                //
                public Expression ExpressionToArrayArgument (EmitContext ec, Expression source, Location loc)
                {
@@ -2840,7 +3324,7 @@ namespace Mono.CSharp {
        public abstract class ExpressionStatement : Expression {
 
                /// <summary>
-               ///   Requests the expression to be emitted in a `statement'
+               ///   Requests the expression to be emitted in a 'statement'
                ///   context.  This means that no new value is left on the
                ///   stack after invoking this method (constrasted with
                ///   Emit that will always leave a value on the stack).
@@ -3284,6 +3768,7 @@ namespace Mono.CSharp {
                        : base (child, return_type)
                        
                {
+                       
                        this.op = op;
                        second_valid = false;
                }
@@ -3315,6 +3800,60 @@ namespace Mono.CSharp {
                }                       
        }
 
+
+       public class NumericToBoolCast : EmptyCast 
+       {
+               Type src_type;
+               
+               public NumericToBoolCast (Expression src, Type src_type)
+                       : base (src, TypeManager.bool_type)
+                       
+               {
+                       this.src_type = src_type;
+               }
+
+               public override Expression DoResolve (EmitContext ec)
+               {
+                       return this;
+               }
+
+               public override void Emit (EmitContext ec)
+               {
+                       base.Emit (ec);
+
+                       if (src_type == TypeManager.byte_type ||
+                               src_type == TypeManager.short_type ||
+                               src_type == TypeManager.int32_type) {
+                               
+                               ec.ig.Emit (OpCodes.Ldc_I4_0);
+                               ec.ig.Emit (OpCodes.Cgt_Un);
+                               return;
+                       } 
+
+                       if (src_type == TypeManager.int64_type) {
+                               ec.ig.Emit (OpCodes.Ldc_I8, (long) 0);
+                               ec.ig.Emit (OpCodes.Cgt_Un);
+                               return;
+                       } 
+
+                       if (src_type == TypeManager.float_type) {
+                               ec.ig.Emit (OpCodes.Ldc_R4, (float) 0);
+                               ec.ig.Emit (OpCodes.Ceq);
+                               ec.ig.Emit (OpCodes.Ldc_I4_0);
+                               ec.ig.Emit (OpCodes.Ceq);
+                               return;
+                       } 
+
+                       if (src_type == TypeManager.double_type) {
+                               ec.ig.Emit (OpCodes.Ldc_R8, (double) 0);
+                               ec.ig.Emit (OpCodes.Ceq);
+                               ec.ig.Emit (OpCodes.Ldc_I4_0);
+                               ec.ig.Emit (OpCodes.Ceq);
+                               return;
+                       }
+               }                       
+       }
+
        /// <summary>
        ///   This kind of cast is used to encapsulate a child and cast it
        ///   to the class requested
@@ -3356,10 +3895,10 @@ namespace Mono.CSharp {
        ///   creating a namespace map from the assemblies, as that requires
        ///   the GetExportedTypes function to be called and a hashtable to
        ///   be constructed which reduces startup time.  If later we find
-       ///   that this is slower, we should create a `NamespaceExpr' expression
+       ///   that this is slower, we should create a 'NamespaceExpr' expression
        ///   that fully participates in the resolution process. 
        ///   
-       ///   For example `System.Console.WriteLine' is decomposed into
+       ///   For example 'System.Console.WriteLine' is decomposed into
        ///   MemberAccess (MemberAccess (SimpleName ("System"), "Console"), "WriteLine")
        ///   
        ///   The first SimpleName wont produce a match on its own, so it will
@@ -3368,7 +3907,7 @@ namespace Mono.CSharp {
        ///   
        ///   System.Console will produce a TypeExpr match.
        ///   
-       ///   The downside of this is that we might be hitting `LookupType' too many
+       ///   The downside of this is that we might be hitting 'LookupType' too many
        ///   times with this scheme.
        /// </remarks>
        public class SimpleName : Expression, ITypeExpression {
@@ -3386,12 +3925,12 @@ namespace Mono.CSharp {
                                Report.Error (
                                        236, l,
                                        "A field initializer cannot reference the non-static field, " +
-                                       "method or property `"+name+"'");
+                                       "method or property '"+name+"'");
                        else
                                Report.Error (
                                        120, l,
                                        "An object reference is required " +
-                                       "for the non-static field `"+name+"'");
+                                       "for the non-static field '"+name+"'");
                }
                
                //
@@ -3437,9 +3976,20 @@ namespace Mono.CSharp {
                        Type t;
                        string alias_value;
 
+                       if (ec.ResolvingTypeTree){
+                               int errors = Report.Errors;
+                               Type dt = ec.DeclSpace.FindType (loc, Name);
+                               if (Report.Errors != errors)
+                                       return null;
+                               
+                               if (dt != null)
+                                       return new TypeExpr (dt, loc);
+                       }
+
                        if ((t = RootContext.LookupType (ds, Name, true, loc)) != null)
                                return new TypeExpr (t, loc);
                                
+
                        //
                        // Stage 2 part b: Lookup up if we are an alias to a type
                        // or a namespace.
@@ -3458,12 +4008,6 @@ namespace Mono.CSharp {
                                return new SimpleName (alias_value, loc);
                        }
                                
-                       if (ec.ResolvingTypeTree){
-                               Type dt = ec.DeclSpace.FindType (Name);
-                               if (dt != null)
-                                       return new TypeExpr (dt, loc);
-                       }
-
                        // No match, maybe our parent can compose us
                        // into something meaningful.
                        return this;
@@ -3475,7 +4019,7 @@ namespace Mono.CSharp {
                ///   Local Variables and Parameters are handled at
                ///   parse time, so they never occur as SimpleNames.
                ///
-               ///   The `allow_static' flag is used by MemberAccess only
+               ///   The 'allow_static' flag is used by MemberAccess only
                ///   and it is used to inform us that it is ok for us to 
                ///   avoid the static check, because MemberAccess might end
                ///   up resolving the Name as a Type name and the access as
@@ -3489,12 +4033,12 @@ namespace Mono.CSharp {
                Expression SimpleNameResolve (EmitContext ec, Expression right_side, bool allow_static)
                {
                        Expression e = null;
-
+                       
                        //
                        // Stage 1: Performed by the parser (binding to locals or parameters).
                        //
                        Block current_block = ec.CurrentBlock;
-                       if (current_block != null && current_block.IsVariableDefined (Name)){
+                       if (ec.InvokingOwnOverload == false && current_block != null && current_block.IsVariableDefined (Name)){
                                LocalVariableReference var;
 
                                var = new LocalVariableReference (ec.CurrentBlock, Name, loc);
@@ -3554,6 +4098,49 @@ namespace Mono.CSharp {
                        if (e == null && ec.ContainerType != null)
                                e = MemberLookup (ec, ec.ContainerType, Name, loc);
 
+// #52067 - Start - Trying to solve
+
+                       if (e == null) {
+                               
+                               ArrayList lookups = new ArrayList();
+                               ArrayList typelookups = new ArrayList();
+                               
+                               int split = Name.LastIndexOf('.');
+                               if (split != -1) {
+                                       String nameSpacePart = Name.Substring(0, split);
+                                       String memberNamePart = Name.Substring(split + 1);
+                                       foreach(Type type in TypeManager.GetPertinentStandardModules(nameSpacePart)) {
+                                               e = MemberLookup(ec, type, memberNamePart, loc);
+                                               if (e != null) {
+                                                       lookups.Add(e);
+                                                       typelookups.Add(type);
+                                               }
+                                       }
+                               }
+                               
+                               string[] NamespacesInScope = RootContext.SourceBeingCompiled.GetNamespacesInScope(ec.DeclSpace.Namespace.Name);
+                               foreach(Type type in TypeManager.GetPertinentStandardModules(NamespacesInScope)) {
+                                       e = MemberLookup(ec, type, Name, loc);
+                                       if (e != null) {
+                                               lookups.Add(e);
+                                               typelookups.Add(type);
+                                       }
+                               }
+                               if (lookups.Count == 1) { 
+                                       e = (Expression)lookups[0];
+                               } else {
+                                       if (lookups.Count > 1) {
+                                               StringBuilder sb = new StringBuilder();
+                                               foreach(Type type in typelookups)
+                                                       sb.Append("'" + type.FullName + "'");                                           
+                                               Error (-1, "The name '" + Name + "' can be resolved to a member of more than one standard module: " + sb.ToString() + ". Please fully qualify it.");
+                                               return null;
+                                       }
+                               }
+                       }
+
+// #52067 - End
+
                        if (e == null)
                                return DoResolveType (ec);
 
@@ -3574,12 +4161,23 @@ namespace Mono.CSharp {
                                if (!me.IsStatic && (me.InstanceExpression == null))
                                        return e;
 
+/* FIXME    If this is not commented out, it seems that it's not possible to reach class members in mBas.
+            Maybe a grammar-related problem?
+
+                               if (!me.IsStatic &&
+                                   TypeManager.IsNestedChildOf (me.InstanceExpression.Type, me.DeclaringType)) {
+                                       Error (38, "Cannot access nonstatic member '" + me.Name + "' of " +
+                                              "outer type '" + me.DeclaringType + "' via nested type '" +
+                                              me.InstanceExpression.Type + "'");
+                                       return null;
+                               }
+*/
                                if (right_side != null)
                                        e = e.DoResolveLValue (ec, right_side);
                                else
                                        e = e.DoResolve (ec);
 
-                               return e;                               
+                               return e;
                        }
 
                        if (ec.IsStatic || ec.IsFieldInitializer){
@@ -3598,8 +4196,8 @@ namespace Mono.CSharp {
                        // find the name as a namespace
                        //
 
-                       Error (103, "The name `" + Name +
-                              "' does not exist in the class `" +
+                       Error (30451, "The name '" + Name +
+                              "' does not exist in the class '" +
                               ec.DeclSpace.Name + "'");
                }
 
@@ -3715,9 +4313,15 @@ namespace Mono.CSharp {
                        eclass = ExprClass.MethodGroup;
                        type = TypeManager.object_type;
                }
+
+               public Type DeclaringType {
+                       get {
+                               return Methods [0].DeclaringType;
+                       }
+               }
                
                //
-               // `A method group may have associated an instance expression' 
+               // 'A method group may have associated an instance expression' 
                // 
                public Expression InstanceExpression {
                        get {
@@ -3767,12 +4371,18 @@ namespace Mono.CSharp {
                
                override public Expression DoResolve (EmitContext ec)
                {
+                       if (instance_expression != null) {
+                               instance_expression = instance_expression.DoResolve (ec);
+                               if (instance_expression == null)
+                                       return null;
+                       }
+
                        return this;
                }
 
                public void ReportUsageError ()
                {
-                       Report.Error (654, loc, "Method `" + Methods [0].DeclaringType + "." +
+                       Report.Error (654, loc, "Method '" + Methods [0].DeclaringType + "." +
                                      Methods [0].Name + "()' is referenced without parentheses");
                }
 
@@ -3851,6 +4461,12 @@ namespace Mono.CSharp {
                        }
                }
 
+               public Type DeclaringType {
+                       get {
+                               return FieldInfo.DeclaringType;
+                       }
+               }
+
                public Expression InstanceExpression {
                        get {
                                return instance_expr;
@@ -4044,17 +4660,13 @@ namespace Mono.CSharp {
                        // Handle initonly fields specially: make a copy and then
                        // get the address of the copy.
                        //
-                       if (FieldInfo.IsInitOnly){
-                               if (ec.IsConstructor) {
-                                       ig.Emit (OpCodes.Ldsflda, FieldInfo);
-                               } else {
-                                       LocalBuilder local;
+                       if (FieldInfo.IsInitOnly && !ec.IsConstructor){
+                               LocalBuilder local;
                                
-                                       Emit (ec);
-                                       local = ig.DeclareLocal (type);
-                                       ig.Emit (OpCodes.Stloc, local);
-                                       ig.Emit (OpCodes.Ldloca, local);
-                               }
+                               Emit (ec);
+                               local = ig.DeclareLocal (type);
+                               ig.Emit (OpCodes.Stloc, local);
+                               ig.Emit (OpCodes.Ldloca, local);
                                return;
                        }
 
@@ -4072,7 +4684,7 @@ namespace Mono.CSharp {
        
        /// <summary>
        ///   Expression that evaluates to a Property.  The Assign class
-       ///   might set the `Value' expression if we are in an assignment.
+       ///   might set the 'Value' expression if we are in an assignment.
        ///
        ///   This is not an LValue because we need to re-write the expression, we
        ///   can not take data from the stack and store it.  
@@ -4080,29 +4692,23 @@ namespace Mono.CSharp {
        public class PropertyExpr : ExpressionStatement, IAssignMethod, IMemberExpr {
                public readonly PropertyInfo PropertyInfo;
                public bool IsBase;
-               MethodInfo [] Accessors;
+               MethodInfo getter, setter;
                bool is_static;
-               
+               public ArrayList PropertyArgs;
+
                Expression instance_expr;
 
-               public PropertyExpr (PropertyInfo pi, Location l)
+               public PropertyExpr (EmitContext ec, PropertyInfo pi, Location l)
                {
                        PropertyInfo = pi;
                        eclass = ExprClass.PropertyAccess;
+                       PropertyArgs = new ArrayList();
                        is_static = false;
                        loc = l;
-                       Accessors = TypeManager.GetAccessors (pi);
 
-                       if (Accessors != null)
-                               foreach (MethodInfo mi in Accessors){
-                                       if (mi != null)
-                                               if (mi.IsStatic)
-                                                       is_static = true;
-                               }
-                       else
-                               Accessors = new MethodInfo [2];
-                       
                        type = TypeManager.TypeToCoreType (pi.PropertyType);
+
+                       ResolveAccessors (ec);
                }
 
                public string Name {
@@ -4123,6 +4729,12 @@ namespace Mono.CSharp {
                        }
                }
                
+               public Type DeclaringType {
+                       get {
+                               return PropertyInfo.DeclaringType;
+                       }
+               }
+
                //
                // The instance expression associated with this expression
                //
@@ -4140,7 +4752,7 @@ namespace Mono.CSharp {
                {
                        if (!PropertyInfo.CanWrite){
                                Report.Error (200, loc, 
-                                             "The property `" + PropertyInfo.Name +
+                                             "The property '" + PropertyInfo.Name +
                                              "' can not be assigned to, as it has not set accessor");
                                return false;
                        }
@@ -4148,40 +4760,86 @@ namespace Mono.CSharp {
                        return true;
                }
 
+               void ResolveAccessors (EmitContext ec)
+               {
+                       BindingFlags flags = BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+                       MemberInfo [] group;
+                       
+                       group = TypeManager.MemberLookup (ec.ContainerType, PropertyInfo.DeclaringType,
+                                                             MemberTypes.Method, flags, "get_" + PropertyInfo.Name);
+
+                       //
+                       // The first method is the closest to us
+                       //
+                       if (group != null && group.Length > 0){
+                               getter = (MethodInfo) group [0];
+
+                               if (getter.IsStatic)
+                                       is_static = true;
+                       }                       
+
+                       //
+                       // The first method is the closest to us
+                       //
+                       group = TypeManager.MemberLookup (ec.ContainerType, PropertyInfo.DeclaringType,
+                                                         MemberTypes.Method, flags, "set_" + PropertyInfo.Name);
+                       if (group != null && group.Length > 0){
+                               setter = (MethodInfo) group [0];
+                               if (setter.IsStatic)
+                                       is_static = true;
+                       }
+               }
+
                override public Expression DoResolve (EmitContext ec)
                {
-                       if (!PropertyInfo.CanRead){
-                               Report.Error (154, loc, 
-                                             "The property `" + PropertyInfo.Name +
+                       if (getter == null){
+                               Report.Error (30524, loc, 
+                                             "The property '" + PropertyInfo.Name +
                                              "' can not be used in " +
                                              "this context because it lacks a get accessor");
                                return null;
                        }
 
+                       if ((instance_expr == null) && ec.IsStatic && !is_static) {
+                               SimpleName.Error_ObjectRefRequired (ec, loc, PropertyInfo.Name);
+                               return null;
+                       }
+
+                       if (instance_expr != null) {
+                               instance_expr = instance_expr.DoResolve (ec);
+                               if (instance_expr == null)
+                                       return null;
+                       }
+
                        return this;
                }
 
                override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
                {
-                       if (!PropertyInfo.CanWrite){
-                               Report.Error (154, loc, 
-                                             "The property `" + PropertyInfo.Name +
+                       if (setter == null){
+                               Report.Error (30526, loc, 
+                                             "The property '" + PropertyInfo.Name +
                                              "' can not be used in " +
                                              "this context because it lacks a set accessor");
                                return null;
                        }
 
+                       if (instance_expr != null) {
+                               instance_expr = instance_expr.DoResolve (ec);
+                               if (instance_expr == null)
+                                       return null;
+                       }
+
                        return this;
                }
 
                override public void Emit (EmitContext ec)
                {
-                       MethodInfo method = Accessors [0];
-
                        //
-                       // Special case: length of single dimension array is turned into ldlen
+                       // Special case: length of single dimension array property is turned into ldlen
                        //
-                       if (method == TypeManager.int_array_get_length){
+                       if ((getter == TypeManager.system_int_array_get_length) ||
+                           (getter == TypeManager.int_array_get_length)){
                                Type iet = instance_expr.Type;
 
                                //
@@ -4194,9 +4852,7 @@ namespace Mono.CSharp {
                                        return;
                                }
                        }
-
-                       Invocation.EmitCall (ec, IsBase, IsStatic, instance_expr, method, null, loc);
-                       
+                       Invocation.EmitCall (ec, IsBase, IsStatic, instance_expr, getter, null, PropertyArgs, loc);
                }
 
                //
@@ -4206,9 +4862,9 @@ namespace Mono.CSharp {
                {
                        Argument arg = new Argument (source, Argument.AType.Expression);
                        ArrayList args = new ArrayList ();
-
+//HERE
                        args.Add (arg);
-                       Invocation.EmitCall (ec, false, IsStatic, instance_expr, Accessors [1], args, loc);
+                       Invocation.EmitCall (ec, IsBase, IsStatic, instance_expr, setter, args, PropertyArgs,loc);
                }
 
                override public void EmitStatement (EmitContext ec)
@@ -4264,6 +4920,12 @@ namespace Mono.CSharp {
                        }
                }
 
+               public Type DeclaringType {
+                       get {
+                               return EventInfo.DeclaringType;
+                       }
+               }
+
                public Expression InstanceExpression {
                        get {
                                return instance_expr;
@@ -4274,15 +4936,34 @@ namespace Mono.CSharp {
                        }
                }
 
+               Expression field_expr = null;
+
                public override Expression DoResolve (EmitContext ec)
                {
-                       // We are born fully resolved
+                       if (instance_expr != null) {
+                               instance_expr = instance_expr.DoResolve (ec);
+                               if (instance_expr == null)
+                                       return null;
+                       }
+
+                       if (this.DeclaringType == ec.ContainerType)     {
+                               MemberInfo mi = GetFieldFromEvent (this);
+                               if (mi == null)
+                                       return null;
+                               field_expr = ExprClassFromMemberInfo (ec, mi, loc);
+                               ((FieldExpr) field_expr).InstanceExpression = instance_expr;
+                               field_expr = field_expr.DoResolve (ec);
+                               if (field_expr == null)
+                                       return null;
+                       }
+
                        return this;
                }
 
                public override void Emit (EmitContext ec)
                {
-                       throw new Exception ("Should not happen I think");
+                       if (field_expr != null)
+                               field_expr.Emit (ec);
                }
 
                public void EmitAddOrRemove (EmitContext ec, Expression source)
@@ -4302,4 +4983,4 @@ namespace Mono.CSharp {
                                        ec, false, IsStatic, instance_expr, remove_accessor, args, loc);
                }
        }
-}      
+}