2005-10-24 Martin Baulig <martin@ximian.com>

[mono.git] / mcs / gmcs / report.cs

diff --git a/mcs/gmcs/report.cs b/mcs/gmcs/report.cs
index 43f2632872592b720978e14cbd0c0bf68df07497..2cef8ad9491902a6675c93288a2f8f71ee5fb9b6 100644 (file)
--- a/mcs/gmcs/report.cs
+++ b/mcs/gmcs/report.cs
@@ -123,15 +123,15 @@ namespace Mono.CSharp {
 
                        public virtual void Print (int code, Location location, string text)
                        {
-                               if (location.Equals (Location.Null)) {
+                               if (location.IsNull) {
                                        Print (code, "", text);
                                        return;
                                }
-                               Print (code, String.Format ("{0}({1})", location.Name, location.Row), text);
+                               Print (code, location.ToString (), text);
                        }
                }
 
-               sealed class WarningMessage: AbstractMessage {
+               sealed class WarningMessage : AbstractMessage {
                        Location loc = Location.Null;
                        readonly int Level;
 
@@ -197,7 +197,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               sealed class ErrorMessage: AbstractMessage {
+               sealed class ErrorMessage : AbstractMessage {
 
                        public override void Print(int code, string location, string text)
                        {
@@ -219,7 +219,7 @@ namespace Mono.CSharp {
 
                public static void FeatureIsNotStandardized (Location loc, string feature)
                {
-                       Report.Error (1644, loc, "Feature '{0}' cannot be used because it is not part of the standardized ISO C# language specification", feature);
+                       Report.Error (1644, loc, "Feature `{0}' cannot be used because it is not part of the standardized ISO C# language specification", feature);
                }
                
                public static string FriendlyStackTrace (Exception e)
@@ -263,6 +263,11 @@ namespace Mono.CSharp {
                        return sb.ToString ();
                }
 
+               public static void StackTrace ()
+               {
+                       Console.WriteLine (FriendlyStackTrace (new StackTrace (true)));
+               }
+
                // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                // IF YOU ADD A NEW WARNING YOU HAVE TO DUPLICATE ITS ID HERE
                //
@@ -270,7 +275,7 @@ namespace Mono.CSharp {
                {
                        int[] all_warnings = new int[] {
                                28, 67, 78, 105, 108, 109, 114, 192, 168, 169, 183, 184, 219, 251, 612, 618, 626, 628, 642, 649,
-                               659, 660, 661, 672, 1030, 1522, 1616, 1691, 1692, 1901, 2002, 2023, 3012, 3019, 8024, 8028
+                               659, 660, 661, 672, 1030, 1522, 1616, 1691, 1692, 1901, 2002, 2023, 3012, 3019, 8024, 8028, 3005
                        };
                        
                        foreach (int i in all_warnings) {
@@ -282,12 +287,12 @@ namespace Mono.CSharp {
                
                static public void LocationOfPreviousError (Location loc)
                {
-                       Stderr.WriteLine (String.Format ("{0}({1}) (Location of symbol related to previous error)", loc.Name, loc.Row));
+                       Stderr.WriteLine (String.Format ("{0} (Location of symbol related to previous error)", loc));
                }    
         
                static public void RuntimeMissingSupport (Location loc, string feature) 
                {
-                       Report.Error (-88, loc, "Your .NET Runtime does not support '{0}'. Please use the latest Mono runtime instead.", feature);
+                       Report.Error (-88, loc, "Your .NET Runtime does not support `{0}'. Please use the latest Mono runtime instead.", feature);
                }
 
                /// <summary>
@@ -296,7 +301,7 @@ namespace Mono.CSharp {
                /// </summary>
                static public void SymbolRelatedToPreviousError (Location loc, string symbol)
                {
-                       SymbolRelatedToPreviousError (String.Format ("{0}({1})", loc.Name, loc.Row), symbol);
+                       SymbolRelatedToPreviousError (loc.ToString (), symbol);
                }
 
                static public void SymbolRelatedToPreviousError (MemberInfo mi)
@@ -310,7 +315,7 @@ namespace Mono.CSharp {
                                        while (mb.Mono_IsInflatedMethod)
                                                mb = mb.GetGenericMethodDefinition ();
                                        IMethodData md = TypeManager.GetMethod (mb);
-                                       SymbolRelatedToPreviousError (md.Location, md.GetSignatureForError (temp_ds));
+                                       SymbolRelatedToPreviousError (md.Location, md.GetSignatureForError ());
                                        return;
                                }
 
@@ -340,12 +345,12 @@ namespace Mono.CSharp {
 
                static void SymbolRelatedToPreviousError (string loc, string symbol)
                {
-                       extra_information.Add (String.Format ("{0}: '{1}' (name of symbol related to previous ", loc, symbol));
+                       extra_information.Add (String.Format ("{0}: `{1}', name of symbol related to previous ", loc, symbol));
                }
 
                public static void ExtraInformation (Location loc, string msg)
                {
-                       extra_information.Add (String.Format ("{0}({1}) {2}", loc.Name, loc.Row, msg));
+                       extra_information.Add (String.Format ("{0} {1}", loc, msg));
                }
 
                public static WarningRegions RegisterWarningRegion (Location location)
@@ -393,8 +398,12 @@ namespace Mono.CSharp {
 
                static public void Error (int code, Location loc, string format, params object[] args)
                {
-                       ErrorMessage e = new ErrorMessage ();
-                       e.Print (code, loc, String.Format (format, args));
+                       Error (code, loc, String.Format (format, args));
+               }
+
+               static public void Error (int code, Location loc, string error)
+               {
+                       new ErrorMessage ().Print (code, loc, error);
                }
 
                static public void SetIgnoreWarning (int code)
@@ -587,7 +596,7 @@ namespace Mono.CSharp {
                        public abstract bool IsEnabled (int code, bool previous);
                }
                
-               class Disable: PragmaCmd
+               class Disable : PragmaCmd
                {
                        int code;
                        public Disable (int line, int code)
@@ -602,7 +611,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               class DisableAll: PragmaCmd
+               class DisableAll : PragmaCmd
                {
                        public DisableAll (int line)
                                : base (line) {}
@@ -613,7 +622,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               class Enable: PragmaCmd
+               class Enable : PragmaCmd
                {
                        int code;
                        public Enable (int line, int code)
@@ -628,7 +637,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               class EnableAll: PragmaCmd
+               class EnableAll : PragmaCmd
                {
                        public EnableAll (int line)
                                : base (line) {}
@@ -681,7 +690,7 @@ namespace Mono.CSharp {
                        if (Report.IsValidWarning (code))
                                return true;
 
-                       Report.Warning (1691, 1, loc, "'{0}' is not a valid warning number", code);
+                       Report.Warning (1691, 1, loc, "`{0}' is not a valid warning number", code);
                        return false;
                }
        }