2010-05-27 Marek Safar <marek.safar@gmail.com>

[mono.git] / mcs / mcs / driver.cs

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index 316b0901fd8917ac5bcecfbe540075c44ac7986e..2ec21ee01647a1c28bb7747d10f5d4da2915c7bc 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -1650,6 +1650,8 @@ namespace Mono.CSharp
                {
                        // TODO: Should be passed to parser as an argument
                        RootContext.ToplevelTypes = new ModuleCompiled (ctx, RootContext.Unsafe);
+                       var ctypes = TypeManager.InitCoreTypes ();
+                       TypeManager.InitExpressionTypes ();
 
                        Parse ();
                        if (Report.Errors > 0)
@@ -1702,6 +1704,7 @@ namespace Mono.CSharp
                        if (timestamps)
                                ShowTime ("Loading references");
 
+                       Import.Initialize ();
                        LoadReferences ();
                        
                        if (modules.Count > 0) {
@@ -1712,7 +1715,7 @@ namespace Mono.CSharp
                        if (timestamps)
                                ShowTime ("References loaded");
                        
-                       if (!TypeManager.InitCoreTypes (ctx) || Report.Errors > 0)
+                       if (!TypeManager.InitCoreTypes (ctx, ctypes))
                                return false;
 
                        TypeManager.InitOptionalCoreTypes (ctx);
@@ -1731,8 +1734,7 @@ namespace Mono.CSharp
                                return false;
                        if (timestamps)
                                ShowTime ("Populate tree");
-                       if (!RootContext.StdLib)
-                               RootContext.BootCorlib_PopulateCoreTypes ();
+
                        RootContext.PopulateTypes ();
 
                        if (Report.Errors == 0 &&
@@ -1755,7 +1757,6 @@ namespace Mono.CSharp
                        if (RootContext.VerifyClsCompliance) {
                                if (CodeGen.Assembly.IsClsCompliant) {
                                        AttributeTester.VerifyModulesClsCompliance (ctx);
-                                       TypeManager.LoadAllImportedTypes ();
                                }
                        }
                        if (Report.Errors > 0)
@@ -2024,19 +2025,28 @@ namespace Mono.CSharp
                {
                        Driver.Reset ();
                        CSharpParser.yacc_verbose_flag = 0;
-                       RootContext.Reset (full_flag);
                        Location.Reset ();
+
+                       if (!full_flag)
+                               return;
+
+                       RootContext.Reset (full_flag);
                        TypeManager.Reset ();
                        PredefinedAttributes.Reset ();
-                       TypeHandle.Reset ();
-
-                       if (full_flag)
-                               GlobalRootNamespace.Reset ();
+                       ArrayContainer.Reset ();
+                       ReferenceContainer.Reset ();
+                       PointerContainer.Reset ();
+                       Parameter.Reset ();
+
+                       GlobalRootNamespace.Reset ();
+                       Unary.Reset ();
+                       Binary.Reset ();
+                       ConstantFold.Reset ();
+                       CastFromDecimal.Reset ();
                        
                        NamespaceEntry.Reset ();
                        CodeGen.Reset ();
                        Attribute.Reset ();
-                       AttributeTester.Reset ();
                        AnonymousTypeClass.Reset ();
                        AnonymousMethodBody.Reset ();
                        AnonymousMethodStorey.Reset ();