Author: martin
Date: 2005-04-15 04:54:04 -0400 (Fri, 15 Apr 2005)
New Revision: 43032
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/cs-tokenizer.cs
trunk/mcs/gmcs/report.cs
Log:
**** Merged r41442 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-15 08:53:37 UTC (rev 43031)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-15 08:54:04 UTC (rev 43032)
@@ -1,3 +1,9 @@
+2005-03-04 Marek Safar <[EMAIL PROTECTED]>
+
+ * cs-tokenizer.cs (PreProcessPragma): Add warning 1633, 1635.
+
+ * report.cs (warning_ignore_table): Made public.
+
2005-03-04 Raja R Harinath <[EMAIL PROTECTED]>
Fix #73282.
Modified: trunk/mcs/gmcs/cs-tokenizer.cs
===================================================================
--- trunk/mcs/gmcs/cs-tokenizer.cs 2005-04-15 08:53:37 UTC (rev 43031)
+++ trunk/mcs/gmcs/cs-tokenizer.cs 2005-04-15 08:54:04 UTC (rev 43032)
@@ -1495,7 +1495,10 @@
if (arg.StartsWith (w_restore)) {
int[] codes = ParseNumbers (arg.Substring
(w_restore.Length));
+ Hashtable w_table = Report.warning_ignore_table;
foreach (int code in codes) {
+ if (w_table != null && w_table.Contains
(code))
+ Report.Warning (1635, 1,
Location, "Cannot restore warning 'CS{0:0000}' because it was disabled
globally", code);
Report.RegisterWarningRegion
(Location).WarningEnable (Location, code);
}
return;
@@ -1505,6 +1508,8 @@
Report.Warning (1634, 1, Location, "Expected
disable or restore");
return;
}
+
+ Report.Warning (1633, 1, Location, "Unrecognized
#pragma directive");
}
int[] ParseNumbers (string text)
Modified: trunk/mcs/gmcs/report.cs
===================================================================
--- trunk/mcs/gmcs/report.cs 2005-04-15 08:53:37 UTC (rev 43031)
+++ trunk/mcs/gmcs/report.cs 2005-04-15 08:54:04 UTC (rev 43032)
@@ -59,7 +59,7 @@
//
// Keeps track of the warnings that we are ignoring
//
- static Hashtable warning_ignore_table;
+ public static Hashtable warning_ignore_table;
static Hashtable warning_regions_table;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
