Merge pull request #686 from LHCGreg/12971-IsRedirectedAfterSet

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

diff --git a/mcs/mcs/literal.cs b/mcs/mcs/literal.cs
index 95be95d40b36e5c38fad09782221c1da759a7dcc..1af2d0c9e379ecb600379156bfe84dbf1ab67bb9 100644 (file)
--- a/mcs/mcs/literal.cs
+++ b/mcs/mcs/literal.cs
@@ -50,7 +50,7 @@ namespace Mono.CSharp
                {
                }
 
-               public override void Error_ValueCannotBeConverted (ResolveContext ec, Location loc, TypeSpec t, bool expl)
+               public override void Error_ValueCannotBeConverted (ResolveContext ec, TypeSpec t, bool expl)
                {
                        if (t.IsGenericParameter) {
                                ec.Report.Error(403, loc,
@@ -61,11 +61,11 @@ namespace Mono.CSharp
 
                        if (TypeSpec.IsValueType (t)) {
                                ec.Report.Error(37, loc, "Cannot convert null to `{0}' because it is a value type",
-                                       TypeManager.CSharpName(t));
+                                       t.GetSignatureForError ());
                                return;
                        }
 
-                       base.Error_ValueCannotBeConverted (ec, loc, t, expl);
+                       base.Error_ValueCannotBeConverted (ec, t, expl);
                }
 
                public override string GetValueAsLiteral ()
@@ -95,8 +95,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class CharLiteral : CharConstant, ILiteralConstant
@@ -111,8 +116,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class IntLiteral : IntConstant, ILiteralConstant
@@ -143,8 +153,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class UIntLiteral : UIntConstant, ILiteralConstant
@@ -159,8 +174,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class LongLiteral : LongConstant, ILiteralConstant
@@ -175,8 +195,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class ULongLiteral : ULongConstant, ILiteralConstant
@@ -191,8 +216,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class FloatLiteral : FloatConstant, ILiteralConstant
@@ -207,8 +237,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class DoubleLiteral : DoubleConstant, ILiteralConstant
@@ -218,7 +253,7 @@ namespace Mono.CSharp
                {
                }
 
-               public override void Error_ValueCannotBeConverted (ResolveContext ec, Location loc, TypeSpec target, bool expl)
+               public override void Error_ValueCannotBeConverted (ResolveContext ec, TypeSpec target, bool expl)
                {
                        if (target.BuiltinType == BuiltinTypeSpec.Type.Float) {
                                Error_664 (ec, loc, "float", "f");
@@ -230,7 +265,7 @@ namespace Mono.CSharp
                                return;
                        }
 
-                       base.Error_ValueCannotBeConverted (ec, loc, target, expl);
+                       base.Error_ValueCannotBeConverted (ec, target, expl);
                }
 
                static void Error_664 (ResolveContext ec, Location loc, string type, string suffix)
@@ -245,8 +280,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class DecimalLiteral : DecimalConstant, ILiteralConstant
@@ -261,8 +301,13 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 
        public class StringLiteral : StringConstant, ILiteralConstant
@@ -277,7 +322,12 @@ namespace Mono.CSharp
                }
 
 #if FULL_AST
-               char[] ILiteralConstant.ParsedValue { get; set; }
+               public char[] ParsedValue { get; set; }
 #endif
+
+               public override object Accept (StructuralVisitor visitor)
+               {
+                       return visitor.Visit (this);
+               }
        }
 }