Author: miguel
Date: 2005-09-27 12:28:32 -0400 (Tue, 27 Sep 2005)
New Revision: 50875
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/driver.cs
trunk/mcs/mcs/report.cs
Log:
2005-09-25 Miguel de Icaza <[EMAIL PROTECTED]>
* report.cs (SymbolRelatedToPreviousError): Format the output so
it does not use an open parenthesis that is never closed.
* driver.cs: Follow coding guidelines
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2005-09-27 16:25:43 UTC (rev 50874)
+++ trunk/mcs/mcs/ChangeLog 2005-09-27 16:28:32 UTC (rev 50875)
@@ -1,3 +1,10 @@
+2005-09-25 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * report.cs (SymbolRelatedToPreviousError): Format the output so
+ it does not use an open parenthesis that is never closed.
+
+ * driver.cs: Follow coding guidelines
+
2005-09-27 Marek Safar <[EMAIL PROTECTED]>
Fix #72930.
Modified: trunk/mcs/mcs/driver.cs
===================================================================
--- trunk/mcs/mcs/driver.cs 2005-09-27 16:25:43 UTC (rev 50874)
+++ trunk/mcs/mcs/driver.cs 2005-09-27 16:28:32 UTC (rev 50875)
@@ -93,7 +93,7 @@
//
// Encoding.
//
- static Encoding defaultEncoding;
+ static Encoding default_encoding;
static Encoding encoding;
@@ -109,7 +109,7 @@
win32ResourceFile = win32IconFile = null;
defines = null;
output_file = null;
- encoding = defaultEncoding = null;
+ encoding = default_encoding = null;
first_source = null;
}
@@ -1306,7 +1306,7 @@
encoding = new UTF8Encoding();
break;
case "reset":
- encoding = defaultEncoding;
+ encoding = default_encoding;
break;
default:
try {
@@ -1365,12 +1365,12 @@
try {
// Latin1
- defaultEncoding = Encoding.GetEncoding (28591);
+ default_encoding = Encoding.GetEncoding (28591);
} catch (Exception) {
// iso-8859-1
- defaultEncoding = Encoding.GetEncoding (1252);
+ default_encoding = Encoding.GetEncoding (1252);
}
- encoding = defaultEncoding;
+ encoding = default_encoding;
references = new ArrayList ();
soft_references = new ArrayList ();
Modified: trunk/mcs/mcs/report.cs
===================================================================
--- trunk/mcs/mcs/report.cs 2005-09-27 16:25:43 UTC (rev 50874)
+++ trunk/mcs/mcs/report.cs 2005-09-27 16:28:32 UTC (rev 50875)
@@ -340,7 +340,7 @@
static void SymbolRelatedToPreviousError (string loc, string
symbol)
{
- extra_information.Add (String.Format ("{0}: `{1}' (name
of symbol related to previous ", loc, symbol));
+ extra_information.Add (String.Format ("{0}: `{1}', name
of symbol related to previous ", loc, symbol));
}
public static void ExtraInformation (Location loc, string msg)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches