Merge pull request #1439 from BrzVlad/feature-managed-allocator

[mono.git] / mcs / mcs / constant.cs

diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
index 4a6746840fc6136a62c501d2d901263433fb6a9a..ca9e6fb7df4d6431d2a0a5ac7e9b317e878dc76a 100644 (file)
--- a/mcs/mcs/constant.cs
+++ b/mcs/mcs/constant.cs
@@ -60,7 +60,7 @@ namespace Mono.CSharp {
 
                public override void Error_ValueCannotBeConverted (ResolveContext ec, TypeSpec target, bool expl)
                {
-                       if (!expl && IsLiteral && 
+                       if (!expl && IsLiteral && type.BuiltinType != BuiltinTypeSpec.Type.Double &&
                                BuiltinTypeSpec.IsPrimitiveTypeOrDecimal (target) &&
                                BuiltinTypeSpec.IsPrimitiveTypeOrDecimal (type)) {
                                ec.Report.Error (31, loc, "Constant value `{0}' cannot be converted to a `{1}'",
@@ -2144,6 +2144,11 @@ namespace Mono.CSharp {
                        this.name = name;
                }
 
+               static void Error_MethodGroupWithTypeArguments (ResolveContext rc, Location loc)
+               {
+                       rc.Report.Error (8084, loc, "An argument to nameof operator cannot be method group with type arguments");
+               }
+
                protected override Expression DoResolve (ResolveContext rc)
                {
                        throw new NotSupportedException ();
@@ -2158,29 +2163,81 @@ namespace Mono.CSharp {
                                if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
                                        rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
 
-                               sn.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreAmbiguity);
+                               var res = sn.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreAmbiguity | MemberLookupRestrictions.NameOfExcluded);
+                               if (sn.HasTypeArguments && res is MethodGroupExpr) {
+                                       Error_MethodGroupWithTypeArguments (rc, expr.Location);
+                               }
+
                                return true;
                        }
 
                        var ma = expr as MemberAccess;
                        if (ma != null) {
+                               var lexpr = ma.LeftExpression;
+
                                var res = ma.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreAmbiguity);
 
-                               if (res == null)
+                               if (res == null) {
                                        return false;
+                               }
 
                                if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
                                        rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
 
-                               var emg = res as ExtensionMethodGroupExpr;
-                               if (emg != null && !emg.ResolveNameOf (rc, ma)) {
-                                       return true;
+                               if (ma is QualifiedAliasMember) {
+                                       rc.Report.Error (8083, loc, "An alias-qualified name is not an expression");
+                                       return false;
+                               }
+
+                               if (!IsLeftExpressionValid (lexpr)) {
+                                       rc.Report.Error (8082, lexpr.Location, "An argument to nameof operator cannot include sub-expression");
+                                       return false;
+                               }
+
+                               var mg = res as MethodGroupExpr;
+                               if (mg != null) {
+                                       var emg = res as ExtensionMethodGroupExpr;
+                                       if (emg != null && !emg.ResolveNameOf (rc, ma)) {
+                                               return true;
+                                       }
+
+                                       if (!mg.HasAccessibleCandidate (rc)) {
+                                               ErrorIsInaccesible (rc, ma.GetSignatureForError (), loc);
+                                       }
+
+                                       if (ma.HasTypeArguments) {
+                                               Error_MethodGroupWithTypeArguments (rc, ma.Location);
+                                       }
                                }
 
                                Value = ma.Name;
                                return true;
                        }
 
+                       rc.Report.Error (8081, loc, "Expression does not have a name");
+                       return false;
+               }
+
+               static bool IsLeftExpressionValid (Expression expr)
+               {
+                       if (expr is SimpleName)
+                               return true;
+
+                       if (expr is This)
+                               return true;
+
+                       if (expr is NamespaceExpression)
+                               return true;
+
+                       if (expr is TypeExpr)
+                               return true;
+
+                       var ma = expr as MemberAccess;
+                       if (ma != null) {
+                               // TODO: Will conditional access be allowed?
+                               return IsLeftExpressionValid (ma.LeftExpression);
+                       }
+
                        return false;
                }
 
@@ -2194,7 +2251,6 @@ namespace Mono.CSharp {
                        var arg = args [0];
                        var res = ResolveArgumentExpression (rc, arg.Expr);
                        if (!res) {
-                               name.Error_NameDoesNotExist (rc);
                                return null;
                        }