[sgen] Clear the card table in the finishing pause

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

diff --git a/mcs/mcs/report.cs b/mcs/mcs/report.cs
index 655d469ccca673ac9c6355096151a755ff60bd7e..74bbb46c640cf42053a1d096fd4472a61804934b 100644 (file)
--- a/mcs/mcs/report.cs
+++ b/mcs/mcs/report.cs
@@ -56,7 +56,9 @@ namespace Mono.CSharp {
                        3000, 3001, 3002, 3003, 3005, 3006, 3007, 3008, 3009,
                        3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019,
                        3021, 3022, 3023, 3024, 3026, 3027,
-                       4014
+                       4014, 4024, 4025, 4026,
+                       7035, 7080, 7081, 7082, 7095,
+                       8009, 8094
                };
 
                static HashSet<int> AllWarningsHashSet;
@@ -101,6 +103,9 @@ namespace Mono.CSharp {
                        case LanguageVersion.V_5:
                                version = "5.0";
                                break;
+                       case LanguageVersion.V_6:
+                               version = "6.0";
+                               break;
                        default:
                                throw new InternalErrorException ("Invalid feature version", compiler.Settings.Version);
                        }
@@ -231,22 +236,6 @@ namespace Mono.CSharp {
                        printer.Print (msg, settings.ShowFullPaths);
                }
 
-               public void WarningPlayScript (int code, Location loc, string format, string arg)
-               {
-                       WarningPlayScript (code, loc, string.Format (format, arg));
-               }
-
-               public void WarningPlayScript (int code, Location loc, string error)
-               {
-                       if (reporting_disabled > 0)
-                               return;
-
-                       var msg = new PlayScript.WarningMessage (code, loc, error, extra_information);
-                       extra_information.Clear ();
-
-                       printer.Print (msg, settings.ShowFullPaths);
-               }
-
                public void Warning (int code, int level, Location loc, string format, string arg)
                {
                        Warning (code, level, loc, String.Format (format, arg));
@@ -294,30 +283,9 @@ namespace Mono.CSharp {
                        if (reporting_disabled > 0)
                                return;
 
-                       var msg = new ErrorMessage (code, loc, error, extra_information);
+                       ErrorMessage msg = new ErrorMessage (code, loc, error, extra_information);
                        extra_information.Clear ();
 
-                       ProcessErrorMessage (msg);
-               }
-
-               public void ErrorPlayScript (int code, Location loc, string format, string arg)
-               {
-                       ErrorPlayScript (code, loc, string.Format (format, arg));
-               }
-
-               public void ErrorPlayScript (int code, Location loc, string error)
-               {
-                       if (reporting_disabled > 0)
-                               return;
-
-                       var msg = new PlayScript.ErrorMessage (code, loc, error, extra_information);
-                       extra_information.Clear ();
-
-                       ProcessErrorMessage (msg);
-               }
-
-               void ProcessErrorMessage (AbstractMessage msg)
-               {
                        printer.Print (msg, settings.ShowFullPaths);
 
                        if (settings.Stacktrace)
@@ -526,12 +494,6 @@ namespace Mono.CSharp {
 
                public abstract bool IsWarning { get; }
 
-               public virtual string LanguagePrefix {
-                       get {
-                               return "CS";
-                       }
-               }
-
                public Location Location {
                        get { return location; }
                }
@@ -637,7 +599,7 @@ namespace Mono.CSharp {
                                txt.Append (" ");
                        }
 
-                       txt.AppendFormat ("{0} {3}{1:0000}: {2}", msg.MessageType, msg.Code, msg.Text, msg.LanguagePrefix);
+                       txt.AppendFormat ("{0} CS{1:0000}: {2}", msg.MessageType, msg.Code, msg.Text);
 
                        if (!msg.IsWarning)
                                output.WriteLine (FormatText (txt.ToString ()));
@@ -997,7 +959,7 @@ namespace Mono.CSharp {
                        if (timers == null)
                                return;
 
-                       Dictionary<TimerType, string> timer_names = new Dictionary<TimerType,string> () {
+                       Dictionary<TimerType, string> timer_names = new Dictionary<TimerType,string> {
                                { TimerType.ParseTotal, "Parsing source files" },
                                { TimerType.AssemblyBuilderSetup, "Assembly builder setup" },
                                { TimerType.CreateTypeTotal, "Compiled types created" },
@@ -1096,7 +1058,7 @@ namespace Mono.CSharp {
 
                        public override bool IsEnabled (int code, bool previous)
                        {
-                               return this.code == code ? false : previous;
+                               return this.code != code && previous;
                        }
                }
 
@@ -1122,7 +1084,7 @@ namespace Mono.CSharp {
 
                        public override bool IsEnabled(int code, bool previous)
                        {
-                               return this.code == code ? true : previous;
+                               return this.code == code || previous;
                        }
                }