Improved DateTime parsing of years.

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

diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
index d37e0f01bf37b55a738b4cc3c8b06dcb89bfc67d..ea7e7bfbf2e97b725c69a1da6fb78dd963287f8c 100644 (file)
--- a/mcs/mcs/constant.cs
+++ b/mcs/mcs/constant.cs
@@ -522,7 +522,7 @@ namespace Mono.CSharp {
                        return Value ? 1 : 0;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -573,7 +573,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -673,7 +673,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode ((ushort) Value);
                }
@@ -801,7 +801,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -904,7 +904,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1017,7 +1017,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1126,7 +1126,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1302,7 +1302,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1419,7 +1419,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1550,7 +1550,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1674,7 +1674,7 @@ namespace Mono.CSharp {
                        return base.ConvertImplicitly (type);
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -1803,7 +1803,7 @@ namespace Mono.CSharp {
                        Value = v;
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        enc.Encode (Value);
                }
@@ -2031,8 +2031,6 @@ namespace Mono.CSharp {
        }
 
        public class StringConstant : Constant {
-               public readonly string Value;
-
                public StringConstant (BuiltinTypes types, string s, Location loc)
                        : this (types.String, s, loc)
                {
@@ -2047,6 +2045,13 @@ namespace Mono.CSharp {
                        Value = s;
                }
 
+               protected StringConstant (Location loc)
+                       : base (loc)
+               {
+               }
+
+               public string Value { get; protected set; }
+
                public override object GetValue ()
                {
                        return Value;
@@ -2088,7 +2093,7 @@ namespace Mono.CSharp {
                        ec.Emit (OpCodes.Ldstr, Value);
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        // cast to object
                        if (type != targetType)
@@ -2129,6 +2134,113 @@ namespace Mono.CSharp {
                }
        }
 
+       class NameOf : StringConstant
+       {
+               readonly SimpleName name;
+
+               public NameOf (SimpleName name)
+                       : base (name.Location)
+               {
+                       this.name = name;
+               }
+
+               protected override Expression DoResolve (ResolveContext rc)
+               {
+                       throw new NotSupportedException ();
+               }
+
+               bool ResolveArgumentExpression (ResolveContext rc, Expression expr)
+               {
+                       var sn = expr as SimpleName;
+                       if (sn != null) {
+                               Value = sn.Name;
+
+                               if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
+                                       rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
+
+                               if (sn.HasTypeArguments) {
+                                       // TODO: csc compatible but unhelpful error message
+                                       rc.Report.Error (1001, loc, "Identifier expected");
+                                       return true;
+                               }
+
+                               sn.LookupNameExpression (rc, MemberLookupRestrictions.IgnoreArity | MemberLookupRestrictions.IgnoreAmbiguity);
+                               return true;
+                       }
+
+                       var ma = expr as MemberAccess;
+                       if (ma != null) {
+                               FullNamedExpression fne = ma.LeftExpression as ATypeNameExpression;
+                               if (fne == null) {
+                                       var qam = ma as QualifiedAliasMember;
+                                       if (qam == null)
+                                               return false;
+
+                                       fne = qam.CreateExpressionFromAlias (rc);
+                                       if (fne == null)
+                                               return true;
+                               }
+
+                               Value = ma.Name;
+
+                               if (rc.Module.Compiler.Settings.Version < LanguageVersion.V_6)
+                                       rc.Report.FeatureIsNotAvailable (rc.Module.Compiler, Location, "nameof operator");
+
+                               if (ma.HasTypeArguments) {
+                                       // TODO: csc compatible but unhelpful error message
+                                       rc.Report.Error (1001, loc, "Identifier expected");
+                                       return true;
+                               }
+                                       
+                               var left = fne.ResolveAsTypeOrNamespace (rc, true);
+                               if (left == null)
+                                       return true;
+
+                               var ns = left as NamespaceExpression;
+                               if (ns != null) {
+                                       FullNamedExpression retval = ns.LookupTypeOrNamespace (rc, ma.Name, 0, LookupMode.NameOf, loc);
+                                       if (retval == null)
+                                               ns.Error_NamespaceDoesNotExist (rc, ma.Name, 0);
+
+                                       return true;
+                               }
+
+                               if (left.Type.IsGenericOrParentIsGeneric && left.Type.GetDefinition () != left.Type) {
+                                       rc.Report.Error (8071, loc, "Type arguments are not allowed in the nameof operator");
+                               }
+
+                               var mexpr = MemberLookup (rc, false, left.Type, ma.Name, 0, MemberLookupRestrictions.IgnoreArity | MemberLookupRestrictions.IgnoreAmbiguity, loc);
+                               if (mexpr == null) {
+                                       ma.Error_IdentifierNotFound (rc, left.Type);
+                                       return true;
+                               }
+
+                               return true;
+                       }
+
+                       return false;
+               }
+
+               public Expression ResolveOverload (ResolveContext rc, Arguments args)
+               {
+                       if (args == null || args.Count != 1) {
+                               name.Error_NameDoesNotExist (rc);
+                               return null;
+                       }
+
+                       var arg = args [0];
+                       var res = ResolveArgumentExpression (rc, arg.Expr);
+                       if (!res) {
+                               name.Error_NameDoesNotExist (rc);
+                               return null;
+                       }
+
+                       type = rc.BuiltinTypes.String;
+                       eclass = ExprClass.Value;
+                       return this;
+               }
+       }
+
        //
        // Null constant can have its own type, think of `default (Foo)'
        //
@@ -2153,7 +2265,7 @@ namespace Mono.CSharp {
                        return base.CreateExpressionTree (ec);
                }
 
-               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType)
+               public override void EncodeAttributeValue (IMemberContext rc, AttributeEncoder enc, TypeSpec targetType, TypeSpec parameterType)
                {
                        switch (targetType.BuiltinType) {
                        case BuiltinTypeSpec.Type.Object:
@@ -2174,7 +2286,7 @@ namespace Mono.CSharp {
                                break;
                        }
 
-                       base.EncodeAttributeValue (rc, enc, targetType);
+                       base.EncodeAttributeValue (rc, enc, targetType, parameterType);
                }
 
                public override void Emit (EmitContext ec)
@@ -2314,6 +2426,11 @@ namespace Mono.CSharp {
                        }
                }
 
+               public override bool ContainsEmitWithAwait ()
+               {
+                       return side_effect.ContainsEmitWithAwait ();
+               }
+
                public override object GetValue ()
                {
                        return value.GetValue ();
@@ -2341,6 +2458,11 @@ namespace Mono.CSharp {
                        value.EmitSideEffect (ec);
                }
 
+               public override void FlowAnalysis (FlowAnalysisContext fc)
+               {
+                       side_effect.FlowAnalysis (fc);
+               }
+
                public override bool IsDefaultValue {
                        get { return value.IsDefaultValue; }
                }