X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fdriver.cs;h=a8130b6139c977a75001b09a36644b4e5c776f49;hb=29f95a7d2392761ca8aa5a0d45f598241b40f947;hp=d1a7ca2231a62b27d70cc8f8b6b019466c0f5191;hpb=4c8915a1ed981d2f96f06f0f873321b53f68bd07;p=mono.git diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs old mode 100755 new mode 100644 index d1a7ca2231a..a8130b6139c --- a/mcs/mcs/driver.cs +++ b/mcs/mcs/driver.cs @@ -6,6 +6,7 @@ // Licensed under the terms of the GNU GPL // // (C) 2001, 2002, 2003 Ximian, Inc (http://www.ximian.com) +// (C) 2004, 2005 Novell, Inc // namespace Mono.CSharp @@ -17,7 +18,7 @@ namespace Mono.CSharp using System.IO; using System.Text; using System.Globalization; - using Mono.Languages; + using System.Diagnostics; public enum Target { Library, Exe, Module, WinExe @@ -49,9 +50,6 @@ namespace Mono.CSharp // Lookup paths static ArrayList link_paths; - // Whether we want Yacc to output its progress - static bool yacc_verbose = false; - // Whether we want to only run the tokenizer static bool tokenize = false; @@ -63,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 // @@ -96,21 +91,28 @@ 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; - // - // The system version we are using, if not specified on the commandline we - // will use the same version as corlib for looking for libraries in the GAC. - // - static string sys_version; - + 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) { if (!timestamps) @@ -146,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; @@ -175,14 +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.yacc_verbose = yacc_verbose; + parser.ErrorOutput = Report.Stderr; try { parser.parse (); } catch (Exception ex) { @@ -191,70 +201,79 @@ namespace Mono.CSharp input.Close (); } } + + static void OtherFlags () + { + Console.WriteLine ( + "Other flags in the compiler\n" + + " --fatal Makes errors fatal\n" + + " --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"); + } 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" + - " --fatal Makes errors fatal\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\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" + - " --parse Only parses the source file\n" + - " --expect-error X Expect that error X will be encountered\n" + + " -pkg:P1[,Pn] References packages P1..Pn\n" + " -recurse:SPEC Recursively compiles the files in SPEC ([dir]/file)\n" + " -reference:ASS References the specified assembly (-r:ASS)\n" + - " --stacktrace Shows stack trace at error location\n" + " -target:KIND Specifies the target (KIND is one of: exe, winexe,\n" + " library, module), (short: /t:)\n" + - " --timestamp Displays time stamps of various compiler events\n" + " -unsafe[+|-] Allows unsafe code\n" + " -warnaserror[+|-] Treat warnings as errors\n" + " -warn:LEVEL Sets warning level (the highest is 4, the default is 2)\n" + - " -v Verbose parsing (for debugging the parser)\n" + - " -2 Enables experimental C# features\n" + + " -help2 Show other help flags\n" + "\n" + "Resources:\n" + " -linkresource:FILE[,ID] Links FILE as a resource\n" + " -resource:FILE[,ID] Embed FILE as a resource\n" + " -win32res:FILE Specifies Win32 resource file (.res)\n" + " -win32icon:FILE Use this icon for the output\n" + - " --mcs-debug X Sets MCS debugging level to X\n" + - " @file Read response file for more options\n\n" + + " @file Read response file for more options\n\n" + "Options can be of the form -option or /option"); } 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 and Martin Baulig"); + "The compiler was written by Miguel de Icaza, Ravi Pratap, Martin Baulig, Marek Safar, Raja R Harinath"); Environment.Exit (0); } @@ -262,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); @@ -295,18 +314,17 @@ namespace Mono.CSharp if (assembly.IndexOfAny (path_chars) != -1) { a = Assembly.LoadFrom (assembly); } else { - a = LoadAssemblyFromGac (assembly); - if (a == null) - a = Assembly.LoadFrom (assembly); - if (a == null) - a = Assembly.Load (assembly); + string ass = assembly; + if (ass.EndsWith (".dll") || ass.EndsWith (".exe")) + ass = assembly.Substring (0, assembly.Length - 4); + a = Assembly.Load (ass); } TypeManager.AddAssembly (a); } 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 { @@ -331,48 +349,6 @@ namespace Mono.CSharp } } - static Assembly LoadAssemblyFromGac (string name) - { - PropertyInfo gac = typeof (System.Environment).GetProperty ("GacPath", - BindingFlags.Static|BindingFlags.NonPublic); - - if (gac == null) - return null; - - MethodInfo gac_get = gac.GetGetMethod (true); - string use_name = name; - string asmb_path; - string [] canidates; - - if (name.EndsWith (".dll")) - use_name = name.Substring (0, name.Length - 4); - - asmb_path = Path.Combine ((string) gac_get.Invoke (null, null), use_name); - - if (!Directory.Exists (asmb_path)) - return null; - - canidates = Directory.GetDirectories (asmb_path, GetSysVersion () + "*"); - if (canidates.Length == 0) - canidates = Directory.GetDirectories (asmb_path); - if (canidates.Length == 0) - return null; - try { - Assembly a = Assembly.LoadFrom (Path.Combine (canidates [0], use_name + ".dll")); - return a; - } catch (Exception e) { - return null; - } - } - - static string GetSysVersion () - { - if (sys_version != null) - return sys_version; - sys_version = typeof (object).Assembly.GetName ().Version.ToString (); - return sys_version; - } - static public void LoadModule (MethodInfo adder_method, string module) { Module m; @@ -493,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); } // @@ -641,42 +606,34 @@ 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 () { - RootContext.V2 = true; + RootContext.Version = LanguageVersion.Default; defines.Add ("__V2__"); } @@ -695,12 +652,8 @@ namespace Mono.CSharp static bool UnixParseOption (string arg, ref string [] args, ref int i) { switch (arg){ - case "-vv": - parser_verbose = true; - return true; - case "-v": - yacc_verbose = true; + CSharpParser.yacc_verbose_flag++; return true; case "--version": @@ -712,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); @@ -720,6 +674,7 @@ namespace Mono.CSharp return true; case "--unsafe": + Report.Warning (-29, "Compatibility: Use -unsafe instead of --unsafe"); RootContext.Unsafe = true; return true; @@ -728,8 +683,9 @@ namespace Mono.CSharp Usage (); Environment.Exit (0); return true; - + case "--define": + Report.Warning (-29, "Compatibility: Use -d:SYMBOL instead of --define SYMBOL"); if ((i + 1) >= args.Length){ Usage (); Environment.Exit (1); @@ -760,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; @@ -777,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"); @@ -790,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"); @@ -802,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; @@ -828,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); @@ -843,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); @@ -851,6 +813,7 @@ namespace Mono.CSharp return true; case "--nostdlib": + Report.Warning (-29, "Compatibility: Use -nostdlib instead of --nostdlib"); RootContext.StdLib = false; return true; @@ -859,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); @@ -880,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, @@ -909,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); @@ -926,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; } @@ -938,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) { @@ -982,7 +950,6 @@ namespace Mono.CSharp default: TargetUsage (); - Environment.Exit (1); break; } return true; @@ -992,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-": @@ -1020,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 == ""){ @@ -1031,22 +1011,73 @@ namespace Mono.CSharp resources.Add (value); return true; + + case "/pkg": { + string packages; + + if (value == ""){ + Usage (); + Environment.Exit (1); + } + packages = String.Join (" ", value.Split (new Char [] { ';', ',', '\n', '\r'})); + + ProcessStartInfo pi = new ProcessStartInfo (); + pi.FileName = "pkg-config"; + pi.RedirectStandardOutput = true; + pi.UseShellExecute = false; + pi.Arguments = "--libs " + packages; + Process p = null; + try { + p = Process.Start (pi); + } catch (Exception e) { + Report.Error (-27, "Couldn't run pkg-config: " + e.Message); + Environment.Exit (1); + } + + if (p.StandardOutput == null){ + Report.Warning (-27, "Specified package did not return any information"); + return true; + } + string pkgout = p.StandardOutput.ReadToEnd (); + p.WaitForExit (); + if (p.ExitCode != 0) { + Report.Error (-27, "Error running pkg-config. Check the above output."); + Environment.Exit (1); + } + + if (pkgout != null){ + string [] xargs = pkgout.Trim (new Char [] {' ', '\n', '\r', '\t'}). + Split (new Char [] { ' ', '\t'}); + args = AddArgs (args, xargs); + } + + p.Close (); + return true; + } case "/res": case "/resource": if (value == ""){ - Report.Error (5, arg + " requires an argument"); + Report.Error (5, "-resource requires an argument"); Environment.Exit (1); } if (embedded_resources == null) embedded_resources = new ArrayList (); - embedded_resources.Add (value); + if (embedded_resources.Contains (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)); + } + else { + embedded_resources.Add (value); + } return true; case "/recurse": if (value == ""){ - Report.Error (5, "/recurse requires an argument"); + Report.Error (5, "-recurse requires an argument"); Environment.Exit (1); } CompileFiles (value, true); @@ -1055,7 +1086,7 @@ namespace Mono.CSharp case "/r": case "/reference": { if (value == ""){ - Report.Error (5, arg + " requires an argument"); + Report.Error (5, "-reference requires an argument"); Environment.Exit (1); } @@ -1097,10 +1128,10 @@ namespace Mono.CSharp } case "/doc": { if (value == ""){ - Report.Error (5, arg + " requires an argument"); + Report.Error (2006, arg + " requires an argument"); Environment.Exit (1); } - // TODO handle the /doc argument to generate xml doc + RootContext.Documentation = new Documentation (value); return true; } case "/lib": { @@ -1116,6 +1147,10 @@ namespace Mono.CSharp link_paths.Add (dir); return true; } + + case "/debug-": + want_debugging_support = false; + return true; case "/debug": case "/debug+": @@ -1151,7 +1186,6 @@ namespace Mono.CSharp case "/warnaserror": case "/warnaserror+": Report.WarningsAreErrors = true; - TestWarningConflict(); return true; case "/warnaserror-": @@ -1179,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; @@ -1195,6 +1228,11 @@ namespace Mono.CSharp load_default_config = false; return true; + case "/help2": + OtherFlags (); + Environment.Exit(0); + return true; + case "/help": case "/?": Usage (); @@ -1245,39 +1283,71 @@ namespace Mono.CSharp case "/v2": case "/2": + Console.WriteLine ("The compiler option -2 is obsolete. Please use /langversion instead"); SetupV2 (); return true; - case "/codepage": - int cp = -1; + case "/langversion": + switch (value.ToLower (CultureInfo.InvariantCulture)) { + case "iso-1": + RootContext.Version = LanguageVersion.ISO_1; + return true; - if (value == "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; + case "default": + SetupV2 (); + return 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); + Report.Error (1617, "Invalid option `{0}' for /langversion. It must be either `ISO-1' or `Default'", value); + return true; + + case "/codepage": + switch (value) { + case "utf8": + encoding = new UTF8Encoding(); + 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; } + + static string [] AddArgs (string [] args, string [] extra_args) + { + string [] new_args; + new_args = new string [extra_args.Length + 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; + } /// /// Parses the arguments, and drives the compilation @@ -1295,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 (); @@ -1315,12 +1387,15 @@ namespace Mono.CSharp // path. // - int argc = args.Length; - for (i = 0; i < argc; i++){ - string arg = args [i]; + Hashtable response_file_list = null; + for (i = 0; i < args.Length; i++){ + string arg = args [i]; + if (arg == "") + continue; + if (arg.StartsWith ("@")){ - string [] new_args, extra_args; + string [] extra_args; string response_file = arg.Substring (1); if (response_file_list == null) @@ -1342,11 +1417,7 @@ namespace Mono.CSharp return false; } - new_args = new string [extra_args.Length + argc]; - args.CopyTo (new_args, 0); - extra_args.CopyTo (new_args, argc); - args = new_args; - argc = new_args.Length; + args = AddArgs (args, extra_args); continue; } @@ -1380,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 // @@ -1405,8 +1483,6 @@ namespace Mono.CSharp if (parse_only) return true; - Tokenizer.Cleanup (); - // // Load Core Library for default compilation // @@ -1426,6 +1502,7 @@ namespace Mono.CSharp if (timestamps) ShowTime ("Loading references"); link_paths.Add (GetSystemDir ()); + link_paths.Add (Directory.GetCurrentDirectory ()); LoadReferences (); if (timestamps) @@ -1447,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); } @@ -1465,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); } @@ -1492,12 +1570,15 @@ namespace Mono.CSharp if (timestamps) ShowTime (" Core Types done"); + CodeGen.Module.ResolveAttributes (); + // // The second pass of the compiler // if (timestamps) ShowTime ("Resolving tree"); RootContext.ResolveTree (); + if (Report.Errors > 0) return false; if (timestamps) @@ -1506,9 +1587,15 @@ namespace Mono.CSharp RootContext.BootCorlib_PopulateCoreTypes (); RootContext.PopulateTypes (); + + TypeManager.InitCodeHelpers (); + RootContext.DefineTypes (); - TypeManager.InitCodeHelpers (); + if (RootContext.Documentation != null && + !RootContext.Documentation.OutputDocComment ( + output_file)) + return false; // // Verify using aliases now @@ -1519,11 +1606,15 @@ namespace Mono.CSharp return false; } - if (RootContext.VerifyClsCompliance) { + if (RootContext.VerifyClsCompliance) { CodeGen.Assembly.ResolveClsCompliance (); - AttributeTester.VerifyModulesClsCompliance (); - TypeManager.LoadAllImportedTypes (); + if (CodeGen.Assembly.IsClsCompliant) { + AttributeTester.VerifyModulesClsCompliance (); + TypeManager.LoadAllImportedTypes (); + } } + if (Report.Errors > 0) + return false; // // The code generator @@ -1560,15 +1651,31 @@ namespace Mono.CSharp MethodInfo ep = RootContext.EntryPoint; if (ep == null) { + if (RootContext.MainClass != null) { + DeclSpace main_cont = RootContext.Tree.GetDecl (MemberName.FromDotted (RootContext.MainClass)); + if (main_cont == null) { + Report.Error (1555, "Could not find `{0}' specified for Main method", RootContext.MainClass); + return false; + } + + if (!(main_cont is ClassOrStruct)) { + 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"); } // @@ -1600,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; @@ -1612,7 +1718,7 @@ namespace Mono.CSharp margs [1] = spec.Substring (0, cp); } else { margs [1] = spec; - margs [0] = spec.Replace ('/','.').Replace ('\\', '.'); + margs [0] = Path.GetFileName (spec); } if (File.Exists ((string) margs [1])) @@ -1681,25 +1787,34 @@ namespace Mono.CSharp #endif return (Report.Errors == 0); } - } // // 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 (); } } }