X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Flocation.cs;h=79cee3cbf7db1dc87fb77e5acfa57ccfa3259f10;hb=23fbdb66437357ec6d50f498ed8e88590cd89196;hp=2861d7a5bcba5580f539c2963cf0c9f303b1dc36;hpb=da4f9e9b2afb23791029d0bb09d78b868aabd870;p=mono.git diff --git a/mcs/mcs/location.cs b/mcs/mcs/location.cs index 2861d7a5bcb..79cee3cbf7d 100644 --- a/mcs/mcs/location.cs +++ b/mcs/mcs/location.cs @@ -4,46 +4,145 @@ // Author: // Miguel de Icaza // Atsushi Enomoto +// Marek Safar (marek.safar@gmail.com) // -// (C) 2001 Ximian, Inc. -// (C) 2005 Novell, Inc. +// Copyright 2001 Ximian, Inc. +// Copyright 2005 Novell, Inc. // using System; -using System.IO; -using System.Collections; +using System.Collections.Generic; using Mono.CompilerServices.SymbolWriter; +using System.Diagnostics; +using System.Linq; + +namespace Mono.CSharp +{ + // + // This is one single source file. + // + public class SourceFile : IEquatable + { + // + // Used by #line directive to track hidden sequence point + // regions + // + struct LocationRegion : IComparable + { + public readonly Location Start; + public readonly Location End; + + public LocationRegion (Location start, Location end) + { + this.Start = start; + this.End = end; + } + + public int CompareTo (LocationRegion other) + { + if (Start.Row == other.Start.Row) + return Start.Column.CompareTo (other.Start.Column); + + return Start.Row.CompareTo (other.Start.Row); + } + + public override string ToString () + { + return Start.ToString () + " - " + End.ToString (); + } + } + + static readonly byte[] MD5Algorith = { 96, 166, 110, 64, 207, 100, 130, 76, 182, 240, 66, 212, 129, 114, 167, 153 }; -namespace Mono.CSharp { - /// - /// This is one single source file. - /// - /// - /// This is intentionally a class and not a struct since we need - /// to pass this by reference. - /// - public sealed class SourceFile : ISourceFile { public readonly string Name; - public readonly string Path; + public readonly string FullPathName; public readonly int Index; - public SourceFileEntry SourceFileEntry; - public bool HasLineDirective; + public bool AutoGenerated; + + SourceFileEntry file; + byte[] algGuid, checksum; + List hidden_lines; public SourceFile (string name, string path, int index) { this.Index = index; this.Name = name; - this.Path = path; + this.FullPathName = path; + } + + public byte[] Checksum { + get { + return checksum; + } + } + + public bool HasChecksum { + get { + return checksum != null; + } + } + + public SourceFileEntry SourceFileEntry { + get { + return file; + } + } + + public void SetChecksum (byte[] checksum) + { + SetChecksum (MD5Algorith, checksum); } - SourceFileEntry ISourceFile.Entry { - get { return SourceFileEntry; } + public void SetChecksum (byte[] algorithmGuid, byte[] checksum) + { + this.algGuid = algorithmGuid; + this.checksum = checksum; + } + + public SourceFileEntry CreateSymbolInfo (MonoSymbolFile symwriter) + { + if (hidden_lines != null) + hidden_lines.Sort (); + + file = new SourceFileEntry (symwriter, FullPathName, algGuid, checksum); + if (AutoGenerated) + file.SetAutoGenerated (); + + return file; + } + + public bool Equals (SourceFile other) + { + return FullPathName == other.FullPathName; + } + + public bool IsHiddenLocation (Location loc) + { + if (hidden_lines == null) + return false; + + int index = hidden_lines.BinarySearch (new LocationRegion (loc, loc)); + index = ~index; + if (index > 0) { + var found = hidden_lines[index - 1]; + if (loc.Row < found.End.Row) + return true; + } + + return false; + } + + public void RegisterHiddenScope (Location start, Location end) + { + if (hidden_lines == null) + hidden_lines = new List (); + + hidden_lines.Add (new LocationRegion (start, end)); } public override string ToString () { - return String.Format ("SourceFile ({0}:{1}:{2}:{3})", - Name, Path, Index, SourceFileEntry); + return String.Format ("SourceFile ({0}:{1}:{2})", Name, FullPathName, Index); } } @@ -63,9 +162,8 @@ namespace Mono.CSharp { /// /// http://lists.ximian.com/pipermail/mono-devel-list/2004-December/009508.html /// - public struct Location { - int token; - + public struct Location : IEquatable + { struct Checkpoint { public readonly int LineOffset; public readonly int File; @@ -77,64 +175,43 @@ namespace Mono.CSharp { } } - static ArrayList source_list; - static Hashtable source_files; - static int checkpoint_bits; - static int source_count; - static int current_source; - static int line_delta_bits; - static int line_delta_mask; - static int column_bits; - static int column_mask; +#if FULL_AST + readonly long token; + + const int column_bits = 24; + const int line_delta_bits = 24; +#else + readonly int token; + + const int column_bits = 8; + const int line_delta_bits = 8; +#endif + const int checkpoint_bits = 16; + + const int column_mask = (1 << column_bits) - 1; + const int max_column = column_mask; + + static List source_list; static Checkpoint [] checkpoints; static int checkpoint_index; - public readonly static Location Null = new Location (-1); + public readonly static Location Null = new Location (); public static bool InEmacs; static Location () { - source_files = new Hashtable (); - source_list = new ArrayList (); - current_source = 0; - checkpoints = new Checkpoint [10]; + Reset (); } public static void Reset () { - source_files = new Hashtable (); - source_list = new ArrayList (); - current_source = 0; - source_count = 0; + source_list = new List (); + checkpoint_index = 0; } - // - // This must be called before parsing/tokenizing any files. - // - static public void AddFile (string name) + public static void AddFile (SourceFile file) { - string path = Path.GetFullPath (name); - - if (source_files.Contains (path)){ - int id = (int) source_files [path]; - string other_name = ((SourceFile) source_list [id - 1]).Name; - if (name.Equals (other_name)) - Report.Warning (2002, 1, "Source file `{0}' specified multiple times", other_name); - else - Report.Warning (2002, 1, "Source filenames `{0}' and `{1}' both refer to the same file: {2}", name, other_name, path); - return; - } - - source_files.Add (path, ++source_count); - source_list.Add (new SourceFile (name, path, source_count)); - } - - static public SourceFile[] SourceFiles { - get { - SourceFile[] retval = new SourceFile [source_list.Count]; - source_list.CopyTo (retval, 0); - return retval; - } + source_list.Add (file); } // @@ -143,73 +220,30 @@ namespace Mono.CSharp { // source file. We reserve some extra space for files we encounter via #line // directives while parsing. // - static public void Initialize () + static public void Initialize (List files) { - checkpoints = new Checkpoint [source_list.Count * 2]; + source_list.AddRange (files); + + checkpoints = new Checkpoint [System.Math.Max (1, source_list.Count * 2)]; if (checkpoints.Length > 0) checkpoints [0] = new Checkpoint (0, 0); - - column_bits = 8; - column_mask = 0xFF; - line_delta_bits = 8; - line_delta_mask = 0xFF00; - checkpoint_index = 0; - checkpoint_bits = 16; - } - - // - // This is used when we encounter a #line preprocessing directive. - // - static public SourceFile LookupFile (string name) - { - string path = name.Length == 0 ? "" : Path.GetFullPath (name); - - if (!source_files.Contains (path)) { - if (source_count >= (1 << checkpoint_bits)) - return new SourceFile (name, path, 0); - - source_files.Add (path, ++source_count); - SourceFile retval = new SourceFile (name, path, source_count); - source_list.Add (retval); - return retval; - } - - int index = (int) source_files [path]; - return (SourceFile) source_list [index - 1]; - } - - static public void Push (SourceFile file) - { - current_source = file.Index; - // File is always pushed before being changed. } - // - // If we're compiling with debugging support, this is called between parsing - // and code generation to register all the source files with the - // symbol writer. - // - static public void DefineSymbolDocuments (SymbolWriter symwriter) - { - foreach (SourceFile file in source_list) { - file.SourceFileEntry = symwriter.DefineDocument (file.Path); - } - } - - public Location (int row) - : this (row, 0) - { - } - - public Location (int row, int column) + public Location (SourceFile file, int row, int column) { if (row <= 0) token = 0; else { - if (column > 255) - column = 255; - int target = -1; - int delta = 0; + if (column > max_column) + column = max_column; + + long target = -1; + long delta = 0; + + // TODO: For eval only, need better handling of empty + int file_index = file == null ? 0 : file.Index; + + // FIXME: This value is certainly wrong but what was the intension int max = checkpoint_index < 10 ? checkpoint_index : 10; for (int i = 0; i < max; i++) { @@ -217,40 +251,58 @@ namespace Mono.CSharp { delta = row - offset; if (delta >= 0 && delta < (1 << line_delta_bits) && - checkpoints [checkpoint_index - i].File == current_source) { + checkpoints[checkpoint_index - i].File == file_index) { target = checkpoint_index - i; break; } } if (target == -1) { - AddCheckpoint (current_source, row); + AddCheckpoint (file_index, row); target = checkpoint_index; delta = row % (1 << line_delta_bits); } + long l = column + - (long) (delta << column_bits) + - (long) (target << (line_delta_bits + column_bits)); + (delta << column_bits) + + (target << (line_delta_bits + column_bits)); +#if FULL_AST + token = l; +#else token = l > 0xFFFFFFFF ? 0 : (int) l; +#endif } } + public static Location operator - (Location loc, int columns) + { + return new Location (loc.SourceFile, loc.Row, loc.Column - columns); + } + static void AddCheckpoint (int file, int row) { if (checkpoints.Length == ++checkpoint_index) { - Checkpoint [] tmp = new Checkpoint [checkpoint_index * 2]; - Array.Copy (checkpoints, tmp, checkpoints.Length); - checkpoints = tmp; + Array.Resize (ref checkpoints, checkpoint_index * 2); } checkpoints [checkpoint_index] = new Checkpoint (file, row); } - public override string ToString () + string FormatLocation (string fileName) { if (column_bits == 0 || InEmacs) - return Name + "(" + Row + "):"; - else - return Name + "(" + Row + "," + Column + - (Column == column_mask ? "+):" : "):"); + return fileName + "(" + Row.ToString () + "):"; + + return fileName + "(" + Row.ToString () + "," + Column.ToString () + + (Column == max_column ? "+):" : "):"); + } + + public override string ToString () + { + return FormatLocation (Name); + } + + public string ToStringFullName () + { + return FormatLocation (NameFullPath); } /// @@ -263,23 +315,40 @@ namespace Mono.CSharp { public string Name { get { int index = File; - if (token == 0 || index == 0) - return "Internal"; + if (token == 0 || index <= 0) + return null; - SourceFile file = (SourceFile) source_list [index - 1]; + SourceFile file = source_list [index - 1]; return file.Name; } } + public string NameFullPath { + get { + int index = File; + if (token == 0 || index <= 0) + return null; + + return source_list[index - 1].FullPathName; + } + } + int CheckpointIndex { - get { return (int) ((token & 0xFFFF0000) >> (line_delta_bits + column_bits)); } + get { + const int checkpoint_mask = (1 << checkpoint_bits) - 1; + return ((int) (token >> (line_delta_bits + column_bits))) & checkpoint_mask; + } } public int Row { get { if (token == 0) return 1; - return checkpoints [CheckpointIndex].LineOffset + ((token & line_delta_mask) >> column_bits); + + int offset = checkpoints[CheckpointIndex].LineOffset; + + const int line_delta_mask = (1 << column_bits) - 1; + return offset + (((int)(token >> column_bits)) & line_delta_mask); } } @@ -317,25 +386,176 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format (" int index = File; if (index == 0) return null; - return (SourceFile) source_list [index - 1]; + return source_list [index - 1]; } } + + #region IEquatable Members + + public bool Equals (Location other) + { + return this.token == other.token; + } + + #endregion } - public class LocatedToken + // + // A bag of additional locations to support full ast tree + // + public class LocationsBag { - public readonly Location Location; - public readonly string Value; + public class MemberLocations + { + public readonly IList> Modifiers; + List locations; + + public MemberLocations (IList> mods) + { + Modifiers = mods; + } + + public MemberLocations (IList> mods, Location loc) + : this (mods) + { + AddLocations (loc); + } + + public MemberLocations (IList> mods, Location[] locs) + : this (mods) + { + AddLocations (locs); + } + + public MemberLocations (IList> mods, List locs) + : this (mods) + { + locations = locs; + } + + #region Properties + + public Location this [int index] { + get { + return locations [index]; + } + } + + public int Count { + get { + return locations.Count; + } + } - public LocatedToken (Location loc, string value) + #endregion + + public void AddLocations (Location loc) + { + if (locations == null) { + locations = new List (); + } + + locations.Add (loc); + } + + public void AddLocations (params Location[] additional) + { + if (locations == null) { + locations = new List (additional); + } else { + locations.AddRange (additional); + } + } + } + + Dictionary> simple_locs = new Dictionary> (ReferenceEquality.Default); + Dictionary member_locs = new Dictionary (ReferenceEquality.Default); + + [Conditional ("FULL_AST")] + public void AddLocation (object element, params Location[] locations) { - Location = loc; - Value = value; + simple_locs.Add (element, new List (locations)); } - public override string ToString () + [Conditional ("FULL_AST")] + public void InsertLocation (object element, int index, Location location) + { + List found; + if (!simple_locs.TryGetValue (element, out found)) { + found = new List (); + simple_locs.Add (element, found); + } + + found.Insert (index, location); + } + + [Conditional ("FULL_AST")] + public void AddStatement (object element, params Location[] locations) + { + if (locations.Length == 0) + throw new ArgumentException ("Statement is missing semicolon location"); + + AddLocation (element, locations); + } + + [Conditional ("FULL_AST")] + public void AddMember (MemberCore member, IList> modLocations) + { + member_locs.Add (member, new MemberLocations (modLocations)); + } + + [Conditional ("FULL_AST")] + public void AddMember (MemberCore member, IList> modLocations, Location location) + { + member_locs.Add (member, new MemberLocations (modLocations, location)); + } + + [Conditional ("FULL_AST")] + public void AddMember (MemberCore member, IList> modLocations, params Location[] locations) + { + member_locs.Add (member, new MemberLocations (modLocations, locations)); + } + + [Conditional ("FULL_AST")] + public void AddMember (MemberCore member, IList> modLocations, List locations) + { + member_locs.Add (member, new MemberLocations (modLocations, locations)); + } + + [Conditional ("FULL_AST")] + public void AppendTo (object element, Location location) + { + List found; + if (!simple_locs.TryGetValue (element, out found)) { + found = new List (); + simple_locs.Add (element, found); + } + + found.Add (location); + } + + [Conditional ("FULL_AST")] + public void AppendToMember (MemberCore existing, params Location[] locations) + { + MemberLocations member; + if (member_locs.TryGetValue (existing, out member)) { + member.AddLocations (locations); + return; + } + } + + public List GetLocations (object element) + { + List found; + simple_locs.TryGetValue (element, out found); + return found; + } + + public MemberLocations GetMemberLocation (MemberCore element) { - return Location.ToString () + Value; + MemberLocations found; + member_locs.TryGetValue (element, out found); + return found; } } }