[mcs] Further improvements to fixed statement changes from 4ea0fbbd4433d57e41e2327bbf...

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

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index 17bc2a2444efebe6dc3a001594635efd5fbe3ecf..994fdb8afd54bae3e36c1a69098dec28ce132305 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -57,7 +57,7 @@ namespace Mono.CSharp
                                SeekableStreamReader reader = new SeekableStreamReader (input, ctx.Settings.Encoding);
                                var file = new CompilationSourceFile (module, sourceFile);
 
-                               Tokenizer lexer = new Tokenizer (reader, file, session);
+                               Tokenizer lexer = new Tokenizer (reader, file, session, ctx.Report);
                                int token, tokens = 0, errors = 0;
 
                                while ((token = lexer.token ()) != Token.EOF){
@@ -78,7 +78,7 @@ namespace Mono.CSharp
 
                        Location.Initialize (sources);
 
-                       var session = new ParserSession () {
+                       var session = new ParserSession {
                                UseJayGlobalArrays = true,
                                LocatedTokens = new LocatedToken[15000]
                        };
@@ -166,13 +166,8 @@ namespace Mono.CSharp
                        var file = new CompilationSourceFile (module, sourceFile);
                        module.AddTypeContainer (file);
 
-                       if (sourceFile.IsPlayScript) {
-                               var parser = new PlayScript.PlayScriptParser (reader, file, report, session);
-                               parser.parse ();
-                       } else {
-                               var parser = new CSharpParser (reader, file, report, session);
-                               parser.parse ();
-                       }
+                       CSharpParser parser = new CSharpParser (reader, file, report, session);
+                       parser.parse ();
                }
                
                public static int Main (string[] args)
@@ -333,6 +328,7 @@ namespace Mono.CSharp
                        tr.Start (TimeReporter.TimerType.CreateTypeTotal);
                        module.CreateContainer ();
                        importer.AddCompiledAssembly (assembly);
+                       references_loader.CompiledAssembly = assembly;
                        tr.Stop (TimeReporter.TimerType.CreateTypeTotal);
 
                        references_loader.LoadReferences (module);
@@ -366,6 +362,9 @@ namespace Mono.CSharp
 #endif
                        module.InitializePredefinedTypes ();
 
+                       if (settings.GetResourceStrings != null)
+                               module.LoadGetResourceStrings (settings.GetResourceStrings);
+
                        tr.Start (TimeReporter.TimerType.ModuleDefinitionTotal);
                        module.Define ();
                        tr.Stop (TimeReporter.TimerType.ModuleDefinitionTotal);