X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Freport.cs;h=cc3d82b26e0bd17639baf9a4034d871fe5e24de6;hb=edbc5c2334e10836479d1cc528c68d4ad5b47440;hp=74bbb46c640cf42053a1d096fd4472a61804934b;hpb=0b4bc83e79ca3057693089dc7f926004bb9d9592;p=mono.git diff --git a/mcs/mcs/report.cs b/mcs/mcs/report.cs index 74bbb46c640..cc3d82b26e0 100644 --- a/mcs/mcs/report.cs +++ b/mcs/mcs/report.cs @@ -58,15 +58,13 @@ namespace Mono.CSharp { 3021, 3022, 3023, 3024, 3026, 3027, 4014, 4024, 4025, 4026, 7035, 7080, 7081, 7082, 7095, - 8009, 8094 + 8009, 8094, 8123 }; - static HashSet AllWarningsHashSet; - public Report (CompilerContext context, ReportPrinter printer) { if (context == null) - throw new ArgumentNullException ("settings"); + throw new ArgumentNullException ("context"); if (printer == null) throw new ArgumentNullException ("printer"); @@ -106,6 +104,9 @@ namespace Mono.CSharp { case LanguageVersion.V_6: version = "6.0"; break; + case LanguageVersion.V_7: + version = "7.0"; + break; default: throw new InternalErrorException ("Invalid feature version", compiler.Settings.Version); } @@ -175,18 +176,6 @@ namespace Mono.CSharp { extra_information.Add (msg); } - public bool CheckWarningCode (int code, Location loc) - { - if (AllWarningsHashSet == null) - AllWarningsHashSet = new HashSet (AllWarnings); - - if (AllWarningsHashSet.Contains (code)) - return true; - - Warning (1691, 1, loc, "`{0}' is not a valid warning number", code); - return false; - } - public void ExtraInformation (Location loc, string msg) { extra_information.Add (String.Format ("{0} {1}", loc, msg)); @@ -1109,8 +1098,7 @@ namespace Mono.CSharp { public void WarningDisable (Location location, int code, Report Report) { - if (Report.CheckWarningCode (code, location)) - regions.Add (new Disable (location.Row, code)); + regions.Add (new Disable (location.Row, code)); } public void WarningEnable (int line) @@ -1120,9 +1108,6 @@ namespace Mono.CSharp { public void WarningEnable (Location location, int code, CompilerContext context) { - if (!context.Report.CheckWarningCode (code, location)) - return; - if (context.Settings.IsWarningDisabledGlobally (code)) context.Report.Warning (1635, 1, location, "Cannot restore warning `CS{0:0000}' because it was disabled globally", code);