Author: martin
Date: 2005-04-19 10:57:41 -0400 (Tue, 19 Apr 2005)
New Revision: 43264

Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/driver.cs
Log:
**** Merged r42760 from MCS ****


Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2005-04-19 14:56:04 UTC (rev 43263)
+++ trunk/mcs/gmcs/ChangeLog    2005-04-19 14:57:41 UTC (rev 43264)
@@ -1,6 +1,9 @@
 2005-04-10  Miguel de Icaza  <[EMAIL PROTECTED]>
 
-       * driver.cs (CompilerCallableEntryPoint.InvokeCompiler): Always
+       * driver.cs (MainDriver): Stop processing if the CLS stage found
+       errors. 
+
+       (CompilerCallableEntryPoint.InvokeCompiler): Always
        reset after execution;   Take a TextWriter argument for the
        output.
 

Modified: trunk/mcs/gmcs/driver.cs
===================================================================
--- trunk/mcs/gmcs/driver.cs    2005-04-19 14:56:04 UTC (rev 43263)
+++ trunk/mcs/gmcs/driver.cs    2005-04-19 14:57:41 UTC (rev 43264)
@@ -1577,7 +1577,7 @@
                                return false;
                        }
                        
-                       if (RootContext.VerifyClsCompliance) { 
+                       if (RootContext.VerifyClsCompliance) {
                                CodeGen.Assembly.ResolveClsCompliance ();
                                if (CodeGen.Assembly.IsClsCompliant) {
                                AttributeTester.VerifyModulesClsCompliance ();
@@ -1585,6 +1585,8 @@
                                        
AttributeTester.VerifyTopLevelNameClsCompliance ();
                                }
                        }
+                       if (Report.Errors > 0)
+                               return false;
                        
                        //
                        // The code generator

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to