Author: martin
Date: 2005-04-30 03:53:08 -0400 (Sat, 30 Apr 2005)
New Revision: 43815
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/driver.cs
Log:
**** Merged r43450 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-30 07:44:41 UTC (rev 43814)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-30 07:53:08 UTC (rev 43815)
@@ -1,3 +1,8 @@
+2005-04-22 Marek Safar <[EMAIL PROTECTED]>
+
+ * driver.cs (CompilerCallableEntryPoint.Invoke): Reset under any
+ circumstances.
+
2005-04-20 John Luke <[EMAIL PROTECTED]>
* driver.cs: fix typo in error message, --outout to --output
Modified: trunk/mcs/gmcs/driver.cs
===================================================================
--- trunk/mcs/gmcs/driver.cs 2005-04-30 07:44:41 UTC (rev 43814)
+++ trunk/mcs/gmcs/driver.cs 2005-04-30 07:53:08 UTC (rev 43815)
@@ -116,6 +116,7 @@
output_file = null;
encoding = null;
using_default_encoder = true;
+ first_source = null;
}
public static void ShowTime (string msg)
@@ -1793,11 +1794,13 @@
public static bool InvokeCompiler (string [] args, TextWriter
error)
{
Report.Stderr = error;
- bool ret = Driver.MainDriver (args) && Report.Errors ==
0;
- Report.Stderr = Console.Error;
-
- Reset ();
- return ret;
+ try {
+ return Driver.MainDriver (args) &&
Report.Errors == 0;
+ }
+ finally {
+ Report.Stderr = Console.Error;
+ Reset ();
+ }
}
static void Reset ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
