2005-09-19 Chris Toshok <toshok@ximian.com>
[mono.git] / mcs / mcs / driver.cs
old mode 100755 (executable)
new mode 100644 (file)
index 1e5f488..a8130b6
@@ -6,7 +6,7 @@
 // Licensed under the terms of the GNU GPL
 //
 // (C) 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com)
-// (C) 2004 Novell, Inc
+// (C) 2004, 2005 Novell, Inc
 //
 
 namespace Mono.CSharp
@@ -18,7 +18,6 @@ namespace Mono.CSharp
        using System.IO;
        using System.Text;
        using System.Globalization;
-       using System.Xml;
        using System.Diagnostics;
 
        public enum Target {
@@ -62,15 +61,12 @@ namespace Mono.CSharp
                static bool timestamps = false;
                static bool pause = false;
                static bool show_counters = false;
-               public static bool parser_verbose = false;
                
                //
                // Whether to load the initial config file (what CSC.RSP has by default)
                // 
                static bool load_default_config = true;
 
-               static Hashtable response_file_list;
-
                //
                // A list of resource files
                //
@@ -95,14 +91,27 @@ namespace Mono.CSharp
                static DateTime last_time, first_time;
 
                //
-               // Encoding: ISO-Latin1 is 28591
+               // Encoding.
                //
+               static Encoding defaultEncoding;
                static Encoding encoding;
 
-               //
-               // Whether the user has specified a different encoder manually
-               //
-               static bool using_default_encoder = true;
+
+               static public void Reset ()
+               {
+                       want_debugging_support = false;
+                       parse_only = false;
+                       timestamps = false;
+                       pause = false;
+                       show_counters = false;
+                       load_default_config = true;
+                       resources = embedded_resources = null;
+                       win32ResourceFile = win32IconFile = null;
+                       defines = null;
+                       output_file = null;
+                       encoding = defaultEncoding = null;
+                       first_source = null;
+               }
 
                public static void ShowTime (string msg)
                {
@@ -139,12 +148,12 @@ namespace Mono.CSharp
                        try {
                                input = File.OpenRead (file.Name);
                        } catch {
-                               Report.Error (2001, "Source file '" + file.Name + "' could not be opened");
+                               Report.Error (2001, "Source file `" + file.Name + "' could not be found");
                                return;
                        }
 
                        using (input){
-                               SeekableStreamReader reader = new SeekableStreamReader (input, encoding, using_default_encoder);
+                               SeekableStreamReader reader = new SeekableStreamReader (input, encoding);
                                Tokenizer lexer = new Tokenizer (reader, file, defines);
                                int token, tokens = 0, errors = 0;
 
@@ -168,13 +177,22 @@ namespace Mono.CSharp
                        try {
                                input = File.OpenRead (file.Name);
                        } catch {
-                               Report.Error (2001, "Source file '" + file.Name + "' could not be opened");
+                               Report.Error (2001, "Source file `" + file.Name + "' could not be found");
                                return;
                        }
 
-                       SeekableStreamReader reader = new SeekableStreamReader (input, encoding, using_default_encoder);
-                               
+                       SeekableStreamReader reader = new SeekableStreamReader (input, encoding);
+
+                       // Check 'MZ' header
+                       if (reader.Read () == 77 && reader.Read () == 90) {
+                               Report.Error (2015, "Source file `{0}' is a binary file and not a text file", file.Name);
+                               input.Close ();
+                               return;
+                       }
+
+                       reader.Position = 0;
                        parser = new CSharpParser (reader, file, defines);
+                       parser.ErrorOutput = Report.Stderr;
                        try {
                                parser.parse ();
                        } catch (Exception ex) {
@@ -192,6 +210,7 @@ namespace Mono.CSharp
                                "   --parse            Only parses the source file\n" +
                                "   --stacktrace       Shows stack trace at error location\n" +
                                "   --timestamp        Displays time stamps of various compiler events\n" +
+                               "   --expect-error X   Expect that error X will be encountered\n" +
                                "   -2                 Enables experimental C# features\n" +
                                "   -v                 Verbose parsing (for debugging the parser)\n" + 
                                "   --mcs-debug X      Sets MCS debugging level to X\n");
@@ -200,31 +219,28 @@ namespace Mono.CSharp
                static void Usage ()
                {
                        Console.WriteLine (
-                               "Mono C# compiler, (C) 2001 - 2003 Ximian, Inc.\n" +
+                               "Mono C# compiler, (C) 2001 - 2005 Novell, Inc.\n" +
                                "mcs [options] source-files\n" +
                                "   --about            About the Mono C# compiler\n" +
                                "   -addmodule:MODULE  Adds the module to the generated assembly\n" + 
                                "   -checked[+|-]      Set default context to checked\n" +
-                               "   -codepage:ID       Sets code page to the one in ID\n" +
-                               "                      (number, `utf8' or `reset')\n" +
+                               "   -codepage:ID       Sets code page to the one in ID (number, utf8, reset)\n" +
                                "   -clscheck[+|-]     Disables CLS Compliance verifications" + Environment.NewLine +
                                "   -define:S1[;S2]    Defines one or more symbols (short: /d:)\n" +
-                               "   -debug[+|-]        Generate debugging information\n" + 
+                               "   -debug[+|-], -g    Generate debugging information\n" + 
                                "   -delaysign[+|-]    Only insert the public key into the assembly (no signing)\n" +
                                "   -doc:FILE          XML Documentation file to generate\n" + 
-                               "   -g                 Generate debugging information\n" +
                                "   -keycontainer:NAME The key pair container used to strongname the assembly\n" +
                                "   -keyfile:FILE      The strongname key file used to strongname the assembly\n" +
-                               "   -langversion:TEXT  Specifies language version modes: ISO-1 or Default" + Environment.NewLine +
+                               "   -langversion:TEXT  Specifies language version modes: ISO-1 or Default\n" + 
                                "   -lib:PATH1,PATH2   Adds the paths to the assembly link path\n" +
                                "   -main:class        Specified the class that contains the entry point\n" +
                                "   -noconfig[+|-]     Disables implicit references to assemblies\n" +
                                "   -nostdlib[+|-]     Does not load core libraries\n" +
                                "   -nowarn:W1[,W2]    Disables one or more warnings\n" + 
+                               "   -optimize[+|-]     Enables code optimalizations\n" + 
                                "   -out:FNAME         Specifies output file\n" +
-                               "   -doc:XMLFILE         Generates xml documentation into specified file\n" +
                                "   -pkg:P1[,Pn]       References packages P1..Pn\n" + 
-                               "   --expect-error X   Expect that error X will be encountered\n" +
                                "   -recurse:SPEC      Recursively compiles the files in SPEC ([dir]/file)\n" + 
                                "   -reference:ASS     References the specified assembly (-r:ASS)\n" +
                                "   -target:KIND       Specifies the target (KIND is one of: exe, winexe,\n" +
@@ -245,19 +261,19 @@ namespace Mono.CSharp
 
                static void TargetUsage ()
                {
-                       Report.Error (2019, "Valid options for -target: are exe, winexe, library or module");
+                       Report.Error (2019, "Invalid target type for -target. Valid options are `exe', `winexe', `library' or `module'");
                }
                
                static void About ()
                {
                        Console.WriteLine (
-                               "The Mono C# compiler is (C) 2001, 2002, 2003 Ximian, Inc.\n\n" +
+                               "The Mono C# compiler is (C) 2001-2005, Novell, Inc.\n\n" +
                                "The compiler source code is released under the terms of the GNU GPL\n\n" +
 
                                "For more information on Mono, visit the project Web site\n" +
                                "   http://www.go-mono.com\n\n" +
 
-                               "The compiler was written by Miguel de Icaza, Ravi Pratap, Martin Baulig and Marek Safar");
+                               "The compiler was written by Miguel de Icaza, Ravi Pratap, Martin Baulig, Marek Safar, Raja R Harinath");
                        Environment.Exit (0);
                }
 
@@ -265,14 +281,14 @@ namespace Mono.CSharp
                
                public static int Main (string[] args)
                {
+                       Location.InEmacs = Environment.GetEnvironmentVariable ("EMACS") == "t";
+
                        bool ok = MainDriver (args);
                        
                        if (ok && Report.Errors == 0) {
-                               Console.Write("Compilation succeeded");
                                if (Report.Warnings > 0) {
-                                       Console.Write(" - {0} warning(s)", Report.Warnings);
+                                       Console.WriteLine ("Compilation succeeded - {0} warning(s)", Report.Warnings);
                                }
-                               Console.WriteLine();
                                if (show_counters){
                                        Console.WriteLine ("Counter1: " + counter1);
                                        Console.WriteLine ("Counter2: " + counter2);
@@ -299,7 +315,7 @@ namespace Mono.CSharp
                                        a = Assembly.LoadFrom (assembly);
                                } else {
                                        string ass = assembly;
-                                       if (ass.EndsWith (".dll"))
+                                       if (ass.EndsWith (".dll") || ass.EndsWith (".exe"))
                                                ass = assembly.Substring (0, assembly.Length - 4);
                                        a = Assembly.Load (ass);
                                }
@@ -308,7 +324,7 @@ namespace Mono.CSharp
                        } catch (FileNotFoundException){
                                foreach (string dir in link_paths){
                                        string full_path = Path.Combine (dir, assembly);
-                                       if (!assembly.EndsWith (".dll"))
+                                       if (!assembly.EndsWith (".dll") && !assembly.EndsWith (".exe"))
                                                full_path += ".dll";
 
                                        try {
@@ -453,18 +469,7 @@ namespace Mono.CSharp
                //
                static string GetSystemDir ()
                {
-                       Assembly [] assemblies = AppDomain.CurrentDomain.GetAssemblies ();
-
-                       foreach (Assembly a in assemblies){
-                               string codebase = a.Location;
-                                string fn = System.IO.Path.GetFileName (codebase);
-                               if (fn == "corlib.dll" || fn == "mscorlib.dll"){
-                                       return codebase.Substring (0, codebase.LastIndexOf (System.IO.Path.DirectorySeparatorChar));
-                               }
-                       }
-
-                       Report.Error (-15, "Can not compute my system path");
-                       return "";
+                       return Path.GetDirectoryName (typeof (object).Assembly.Location);
                }
 
                //
@@ -601,37 +606,29 @@ namespace Mono.CSharp
                                soft_references.Insert (p++, def);
                }
 
-               static void SetOutputFile (string name)
+               public static string OutputFile
                {
-                       output_file = name;
+                       set {
+                               output_file = value;
+                       }
+                       get {
+                               return Path.GetFileName (output_file);
+                       }
                }
 
                static void SetWarningLevel (string s)
                {
-                       int level = 0;
+                       int level = -1;
 
                        try {
                                level = Int32.Parse (s);
                        } catch {
-                               Report.Error (
-                                       1900,
-                                       "--wlevel requires a value from 0 to 4");
-                               Environment.Exit (1);
                        }
                        if (level < 0 || level > 4){
-                               Report.Error (1900, "Warning level must be 0 to 4");
-                               Environment.Exit (1);
+                               Report.Error (1900, "Warning level must be in the range 0-4");
+                               return;
                        }
                        RootContext.WarningLevel = level;
-                       TestWarningConflict ();
-               }
-
-               static void TestWarningConflict ()
-               {
-                       if (RootContext.WarningLevel == 0 && Report.WarningsAreErrors) {
-                               Report.Error (1901, "Conflicting options specified: Warning level 0; Treat warnings as errors");
-                               Environment.Exit (1);
-                       }
                }
 
                static void SetupV2 ()
@@ -668,6 +665,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--main": case "-m":
+                               Report.Warning (-29, "Compatibility: Use -main:CLASS instead of --main CLASS or -m CLASS");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Environment.Exit (1);
@@ -676,6 +674,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--unsafe":
+                               Report.Warning (-29, "Compatibility: Use -unsafe instead of --unsafe");
                                RootContext.Unsafe = true;
                                return true;
                                
@@ -686,6 +685,7 @@ namespace Mono.CSharp
                                return true;
 
                        case "--define":
+                               Report.Warning (-29, "Compatibility: Use -d:SYMBOL instead of --define SYMBOL");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Environment.Exit (1);
@@ -716,14 +716,16 @@ namespace Mono.CSharp
                                
                        case "-o": 
                        case "--output":
+                               Report.Warning (-29, "Compatibility: Use -out:FILE instead of --output FILE or -o FILE");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Environment.Exit (1);
                                }
-                               SetOutputFile (args [++i]);
+                               OutputFile = args [++i];
                                return true;
-                               
+
                        case "--checked":
+                               Report.Warning (-29, "Compatibility: Use -checked instead of --checked");
                                RootContext.Checked = true;
                                return true;
                                
@@ -733,6 +735,7 @@ namespace Mono.CSharp
                                
                        case "--linkresource":
                        case "--linkres":
+                               Report.Warning (-29, "Compatibility: Use -linkres:VALUE instead of --linkres VALUE");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Report.Error (5, "Missing argument to --linkres"); 
@@ -746,6 +749,7 @@ namespace Mono.CSharp
                                
                        case "--resource":
                        case "--res":
+                               Report.Warning (-29, "Compatibility: Use -res:VALUE instead of --res VALUE");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Report.Error (5, "Missing argument to --resource"); 
@@ -758,6 +762,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--target":
+                               Report.Warning (-29, "Compatibility: Use -target:KIND instead of --target KIND");
                                if ((i + 1) >= args.Length){
                                        Environment.Exit (1);
                                        return true;
@@ -784,12 +789,12 @@ namespace Mono.CSharp
                                        break;
                                default:
                                        TargetUsage ();
-                                       Environment.Exit (1);
                                        break;
                                }
                                return true;
                                
                        case "-r":
+                               Report.Warning (-29, "Compatibility: Use -r:LIBRARY instead of -r library");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Environment.Exit (1);
@@ -799,6 +804,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "-L":
+                               Report.Warning (-29, "Compatibility: Use -lib:ARG instead of --L arg");
                                if ((i + 1) >= args.Length){
                                        Usage ();       
                                        Environment.Exit (1);
@@ -807,6 +813,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--nostdlib":
+                               Report.Warning (-29, "Compatibility: Use -nostdlib instead of --nostdlib");
                                RootContext.StdLib = false;
                                return true;
                                
@@ -815,11 +822,12 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--werror":
+                               Report.Warning (-29, "Compatibility: Use -warnaserror: option instead of --werror");
                                Report.WarningsAreErrors = true;
-                               TestWarningConflict();
                                return true;
                                
                        case "--nowarn":
+                               Report.Warning (-29, "Compatibility: Use -nowarn instead of --nowarn");
                                if ((i + 1) >= args.Length){
                                        Usage ();
                                        Environment.Exit (1);
@@ -836,6 +844,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--wlevel":
+                               Report.Warning (-29, "Compatibility: Use -warn:LEVEL instead of --wlevel LEVEL");
                                if ((i + 1) >= args.Length){
                                        Report.Error (
                                                1900,
@@ -865,6 +874,7 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--recurse":
+                               Report.Warning (-29, "Compatibility: Use -recurse:PATTERN option instead --recurse PATTERN");
                                if ((i + 1) >= args.Length){
                                        Report.Error (5, "--recurse requires an argument");
                                        Environment.Exit (1);
@@ -882,10 +892,12 @@ namespace Mono.CSharp
                                return true;
                                
                        case "--debug": case "-g":
+                               Report.Warning (-29, "Compatibility: Use -debug option instead of -g or --debug");
                                want_debugging_support = true;
                                return true;
                                
                        case "--noconfig":
+                               Report.Warning (-29, "Compatibility: Use -noconfig option instead of --noconfig");
                                load_default_config = false;
                                return true;
                        }
@@ -894,8 +906,8 @@ namespace Mono.CSharp
                }
 
                //
-               // Currently it is very basic option parsing, but eventually, this will
-               // be the complete option parser
+               // This parses the -arg and /arg options to the compiler, even if the strings
+               // in the following text use "/arg" on the strings.
                //
                static bool CSCParseOption (string option, ref string [] args, ref int i)
                {
@@ -938,7 +950,6 @@ namespace Mono.CSharp
 
                                default:
                                        TargetUsage ();
-                                       Environment.Exit (1);
                                        break;
                                }
                                return true;
@@ -948,12 +959,18 @@ namespace Mono.CSharp
                                        Usage ();
                                        Environment.Exit (1);
                                }
-                               SetOutputFile (value);
+                               OutputFile = value;
                                return true;
 
                        case "/optimize":
                        case "/optimize+":
+                               RootContext.Optimize = true;
+                               return true;
+
                        case "/optimize-":
+                               RootContext.Optimize = false;
+                               return true;
+
                        case "/incremental":
                        case "/incremental+":
                        case "/incremental-":
@@ -976,6 +993,13 @@ namespace Mono.CSharp
                                return true;
                        }
 
+                       case "/bugreport":
+                               //
+                               // We should collect data, runtime, etc and store in the file specified
+                               //
+                               Console.WriteLine ("To file bug reports, please visit: http://www.mono-project.com/Bugs");
+                               return true;
+
                        case "/linkres":
                        case "/linkresource":
                                if (value == ""){
@@ -1041,10 +1065,10 @@ namespace Mono.CSharp
                                        embedded_resources = new ArrayList ();
                                
                                if (embedded_resources.Contains (value)) {
-                                       Report.Error (1508, String.Format ("The resource identifier '{0}' has already been used in this assembly.", value));
+                                       Report.Error (1508, String.Format ("The resource identifier `{0}' has already been used in this assembly.", value));
                                }
                                else if (value.IndexOf (',') != -1 && embedded_resources.Contains (value.Split (',')[1])) {
-                                       Report.Error (1508, String.Format ("The resource identifier '{0}' has already been used in this assembly.", value));
+                                       Report.Error (1508, String.Format ("The resource identifier `{0}' has already been used in this assembly.", value));
                                }
                                else {
                                        embedded_resources.Add (value);
@@ -1162,7 +1186,6 @@ namespace Mono.CSharp
                        case "/warnaserror":
                        case "/warnaserror+":
                                Report.WarningsAreErrors = true;
-                               TestWarningConflict();
                                return true;
 
                        case "/warnaserror-":
@@ -1190,8 +1213,7 @@ namespace Mono.CSharp
                                                }
                                                Report.SetIgnoreWarning (warn);
                                        } catch {
-                                               Report.Error (1904, String.Format("'{0}' is not a valid warning number", wc));
-                                               Environment.Exit (1);
+                                               Report.Error (1904, String.Format("`{0}' is not a valid warning number", wc));
                                        }
                                }
                                return true;
@@ -1275,38 +1297,30 @@ namespace Mono.CSharp
                                                SetupV2 ();
                                                return true;
                                }
-                               Report.Error (1617, "Invalid option '{0}' for /langversion; must be ISO-1 or Default", value);
-                               Environment.Exit (1);
-                               return false;
+                               Report.Error (1617, "Invalid option `{0}' for /langversion. It must be either `ISO-1' or `Default'", value);
+                               return true;
 
                        case "/codepage":
-                               int cp = -1;
-
-                               if (value == "utf8"){
+                               switch (value) {
+                               case "utf8":
                                        encoding = new UTF8Encoding();
-                                       using_default_encoder = false;
-                                       return true;
-                               }
-                               if (value == "reset"){
-                                       //
-                                       // 28591 is the code page for ISO-8859-1 encoding.
-                                       //
-                                       cp = 28591;
-                                       using_default_encoder = true;
-                               }
-                               
-                               try {
-                                       cp = Int32.Parse (value);
-                                       encoding = Encoding.GetEncoding (cp);
-                                       using_default_encoder = false;
-                               } catch {
-                                       Report.Error (2016, String.Format("Code page '{0}' is invalid or not installed", cp));
-                                       Environment.Exit (1);
+                                       break;
+                               case "reset":
+                                       encoding = defaultEncoding;
+                                       break;
+                               default:
+                                       try {
+                                               encoding = Encoding.GetEncoding (
+                                               Int32.Parse (value));
+                                       } catch {
+                                               Report.Error (2016, "Code page `{0}' is invalid or not installed", value);
+                                       }
+                                       break;
                                }
                                return true;
                        }
 
-                       //Report.Error (2007, String.Format ("Unrecognized command-line option: '{0}'", option));
+                       //Report.Error (2007, String.Format ("Unrecognized command-line option: `{0}'", option));
                        //Environment.Exit (1);
                        return false;
                }
@@ -1314,10 +1328,23 @@ namespace Mono.CSharp
                static string [] AddArgs (string [] args, string [] extra_args)
                {
                        string [] new_args;
-
                        new_args = new string [extra_args.Length + args.Length];
-                       args.CopyTo (new_args, 0);
-                       extra_args.CopyTo (new_args, args.Length);
+
+                       // if args contains '--' we have to take that into account
+                       // split args into first half and second half based on '--'
+                       // and add the extra_args before --
+                       int split_position = Array.IndexOf (args, "--");
+                       if (split_position != -1)
+                       {
+                               Array.Copy (args, new_args, split_position);
+                               extra_args.CopyTo (new_args, split_position);
+                               Array.Copy (args, split_position, new_args, split_position + extra_args.Length, args.Length - split_position);
+                       }
+                       else
+                       {
+                               args.CopyTo (new_args, 0);
+                               extra_args.CopyTo (new_args, args.Length);
+                       }
 
                        return new_args;
                }
@@ -1338,12 +1365,14 @@ namespace Mono.CSharp
                        bool parsing_options = true;
 
                        try {
-                               encoding = Encoding.GetEncoding (28591);
-                       } catch {
-                               Console.WriteLine ("Error: could not load encoding 28591, trying 1252");
-                               encoding = Encoding.GetEncoding (1252);
+                               // Latin1
+                               defaultEncoding = Encoding.GetEncoding (28591);
+                       } catch (Exception) {
+                               // iso-8859-1
+                               defaultEncoding = Encoding.GetEncoding (1252);
                        }
-                       
+                       encoding = defaultEncoding;
+
                        references = new ArrayList ();
                        soft_references = new ArrayList ();
                        modules = new ArrayList ();
@@ -1358,6 +1387,8 @@ namespace Mono.CSharp
                        // path.
                        //
 
+                       Hashtable response_file_list = null;
+
                        for (i = 0; i < args.Length; i++){
                                string arg = args [i];
                                if (arg == "")
@@ -1420,6 +1451,13 @@ namespace Mono.CSharp
                        if (tokenize)
                                return true;
 
+                       //
+                       // This will point to the NamespaceEntry of the last file that was parsed, and may
+                       // not be meaningful when resolving classes from other files.  So, reset it to prevent
+                       // silent bugs.
+                       //
+                       RootContext.Tree.Types.NamespaceEntry = null;
+
                        //
                        // If we are an exe, require a source file for the entry point
                        //
@@ -1445,8 +1483,6 @@ namespace Mono.CSharp
                        if (parse_only)
                                return true;
 
-                       Tokenizer.Cleanup ();
-                       
                        //
                        // Load Core Library for default compilation
                        //
@@ -1488,12 +1524,13 @@ namespace Mono.CSharp
                                        output_file = first_source + RootContext.TargetExt;
                        }
 
-                       CodeGen.Init (output_file, output_file, want_debugging_support);
+                       if (!CodeGen.Init (output_file, output_file, want_debugging_support))
+                               return false;
 
                        if (RootContext.Target == Target.Module) {
                                PropertyInfo module_only = typeof (AssemblyBuilder).GetProperty ("IsModuleOnly", BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
                                if (module_only == null) {
-                                       Report.Error (0, new Location (-1), "Cannot use /target:module on this runtime: try the Mono runtime instead.");
+                                       Report.RuntimeMissingSupport (Location.Null, "/target:module");
                                        Environment.Exit (1);
                                }
 
@@ -1506,7 +1543,7 @@ namespace Mono.CSharp
                        if (modules.Count > 0) {
                                MethodInfo adder_method = typeof (AssemblyBuilder).GetMethod ("AddModule", BindingFlags.Instance|BindingFlags.NonPublic);
                                if (adder_method == null) {
-                                       Report.Error (0, new Location (-1), "Cannot use /addmodule on this runtime: Try the Mono runtime instead.");
+                                       Report.RuntimeMissingSupport (Location.Null, "/addmodule");
                                        Environment.Exit (1);
                                }
 
@@ -1533,6 +1570,8 @@ namespace Mono.CSharp
                        if (timestamps)
                                ShowTime ("   Core Types done");
 
+                       CodeGen.Module.ResolveAttributes ();
+
                        //
                        // The second pass of the compiler
                        //
@@ -1548,6 +1587,9 @@ namespace Mono.CSharp
                                RootContext.BootCorlib_PopulateCoreTypes ();
 
                        RootContext.PopulateTypes ();
+
+                       TypeManager.InitCodeHelpers ();
+
                        RootContext.DefineTypes ();
                        
                        if (RootContext.Documentation != null &&
@@ -1555,8 +1597,6 @@ namespace Mono.CSharp
                                        output_file))
                                return false;
 
-                       TypeManager.InitCodeHelpers ();
-
                        //
                        // Verify using aliases now
                        //
@@ -1566,14 +1606,15 @@ namespace Mono.CSharp
                                return false;
                        }
                        
-                       if (RootContext.VerifyClsCompliance) { 
+                       if (RootContext.VerifyClsCompliance) {
                                CodeGen.Assembly.ResolveClsCompliance ();
                                if (CodeGen.Assembly.IsClsCompliant) {
                                        AttributeTester.VerifyModulesClsCompliance ();
                                        TypeManager.LoadAllImportedTypes ();
-                                       AttributeTester.VerifyTopLevelNameClsCompliance ();
                                }
                        }
+                       if (Report.Errors > 0)
+                               return false;
                        
                        //
                        // The code generator
@@ -1611,27 +1652,30 @@ namespace Mono.CSharp
 
                                if (ep == null) {
                                        if (RootContext.MainClass != null) {
-                                               object main_cont = RootContext.Tree.Decls [RootContext.MainClass];
+                                               DeclSpace main_cont = RootContext.Tree.GetDecl (MemberName.FromDotted (RootContext.MainClass));
                                                if (main_cont == null) {
-                                                       Report.Error (1555, output_file, "Could not find '{0}' specified for Main method", RootContext.MainClass); 
+                                                       Report.Error (1555, "Could not find `{0}' specified for Main method", RootContext.MainClass); 
                                                        return false;
                                                }
 
                                                if (!(main_cont is ClassOrStruct)) {
-                                                       Report.Error (1556, output_file, "'{0}' specified for Main method must be a valid class or struct", RootContext.MainClass);
+                                                       Report.Error (1556, "`{0}' specified for Main method must be a valid class or struct", RootContext.MainClass);
                                                        return false;
                                                }
+
+                                               Report.Error (1558, main_cont.Location, "`{0}' does not have a suitable static Main method", main_cont.GetSignatureForError ());
+                                               return false;
                                        }
 
                                        if (Report.Errors == 0)
-                                               Report.Error (5001, "Program " + output_file +
-                                                             " does not have an entry point defined");
+                                               Report.Error (5001, "Program `{0}' does not contain a static `Main' method suitable for an entry point",
+                                                       output_file);
                                        return false;
                                }
 
                                CodeGen.Assembly.Builder.SetEntryPoint (ep, k);
                        } else if (RootContext.MainClass != null) {
-                               Report.Error (2017, "Can not specify -main: when building module or library");
+                               Report.Error (2017, "Cannot specify -main if building a module or library");
                        }
 
                        //
@@ -1663,8 +1707,7 @@ namespace Mono.CSharp
                                        null, CallingConventions.Any, argst, null);
                                
                                if (embed_res == null) {
-                                       Report.Warning (0, new Location (-1),
-                                                       "Cannot embed resources on this runtime: try the Mono runtime instead.");
+                                       Report.RuntimeMissingSupport (Location.Null, "Resource embedding");
                                } else {
                                        foreach (string spec in embedded_resources) {
                                                int cp;
@@ -1750,18 +1793,28 @@ namespace Mono.CSharp
        // This is the only public entry point
        //
        public class CompilerCallableEntryPoint : MarshalByRefObject {
-               static bool used = false;
-               
-               public bool InvokeCompiler (string [] args)
+               public static bool InvokeCompiler (string [] args, TextWriter error)
                {
-                       if (used)
+                       Report.Stderr = error;
+                       try {
+                               return Driver.MainDriver (args) && Report.Errors == 0;
+                       }
+                       finally {
+                               Report.Stderr = Console.Error;
                                Reset ();
-                       bool ok = Driver.MainDriver (args);
-                       return ok && Report.Errors == 0;
+                       }
                }
-
-               public void Reset ()
+               
+               static void Reset ()
                {
+                       Driver.Reset ();
+                       Location.Reset ();
+                       RootContext.Reset ();
+                       Report.Reset ();
+                       TypeManager.Reset ();
+                       TypeHandle.Reset ();
+                       Namespace.Reset ();
+                       CodeGen.Reset ();
                }
        }
 }