Author: marek
Date: 2005-04-19 03:33:03 -0400 (Tue, 19 Apr 2005)
New Revision: 43237
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/attribute.cs
trunk/mcs/mcs/decl.cs
trunk/mcs/mcs/driver.cs
Log:
2005-04-19 Marek Safar <[EMAIL PROTECTED]>
* attribute.cs: Removed debug output.
* decl.cs (MemberCache.AddMethods): Fixed Finalize ignoring.
* driver.cs (Driver.parse): Synchronize parser ErrorOutput with
Report.Stderr.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2005-04-19 04:15:41 UTC (rev 43236)
+++ trunk/mcs/mcs/ChangeLog 2005-04-19 07:33:03 UTC (rev 43237)
@@ -1,3 +1,12 @@
+2005-04-19 Marek Safar <[EMAIL PROTECTED]>
+
+ * attribute.cs: Removed debug output.
+
+ * decl.cs (MemberCache.AddMethods): Fixed Finalize ignoring.
+
+ * driver.cs (Driver.parse): Synchronize parser ErrorOutput with
+ Report.Stderr.
+
2005-04-18 Raja R Harinath <[EMAIL PROTECTED]>
Fix #74481.
Modified: trunk/mcs/mcs/attribute.cs
===================================================================
--- trunk/mcs/mcs/attribute.cs 2005-04-19 04:15:41 UTC (rev 43236)
+++ trunk/mcs/mcs/attribute.cs 2005-04-19 07:33:03 UTC (rev 43237)
@@ -1026,7 +1026,6 @@
}
catch (Exception e) {
Error_AttributeEmitError (e.Message);
- Console.WriteLine (e.ToString ());
return;
}
Modified: trunk/mcs/mcs/decl.cs
===================================================================
--- trunk/mcs/mcs/decl.cs 2005-04-19 04:15:41 UTC (rev 43236)
+++ trunk/mcs/mcs/decl.cs 2005-04-19 07:33:03 UTC (rev 43237)
@@ -1436,18 +1436,16 @@
//
// Also, CSC 1.1 appears to
emit 'Finalize' without a newslot.
//
- if ((member.Name != "Invoke" ||
- !type.IsSubclassOf
(TypeManager.multicast_delegate_type)) &&
- (member.Name != "Finalize"
||
- type !=
TypeManager.object_type)) {
-
Report.SymbolRelatedToPreviousError (base_method);
- Report.Warning (-28,
+ if ((member.Name == "Invoke" &&
type.IsSubclassOf (TypeManager.multicast_delegate_type)) ||
+ (member.Name == "Finalize"
&& member.GetParameters().Length == 0))
+ break;
+
+
Report.SymbolRelatedToPreviousError (base_method);
+ Report.Warning (-28,
"The method
'{0}' is marked 'override'," +
" but doesn't
appear to override any virtual or abstract method:" +
" it may be
ignored during overload resolution",
TypeManager.CSharpSignature (base_method));
- }
-
break;
}
Modified: trunk/mcs/mcs/driver.cs
===================================================================
--- trunk/mcs/mcs/driver.cs 2005-04-19 04:15:41 UTC (rev 43236)
+++ trunk/mcs/mcs/driver.cs 2005-04-19 07:33:03 UTC (rev 43237)
@@ -188,6 +188,7 @@
SeekableStreamReader reader = new SeekableStreamReader
(input, encoding, using_default_encoder);
parser = new CSharpParser (reader, file, defines);
+ parser.ErrorOutput = Report.Stderr;
try {
parser.parse ();
} catch (Exception ex) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
