X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Flocation.cs;h=895ffab86ac010cbeca6a065e4b238a1fea64f9d;hb=acfe0fd967f44780cfede8b61373f8be28887e49;hp=d060185e8cc8bd723748fc3fcad9050a6cb44721;hpb=83f13fcc8a608d2f2a87201ce4ae184ef01d1f8b;p=mono.git
diff --git a/mcs/mcs/location.cs b/mcs/mcs/location.cs
index d060185e8cc..895ffab86ac 100644
--- a/mcs/mcs/location.cs
+++ b/mcs/mcs/location.cs
@@ -22,21 +22,47 @@ namespace Mono.CSharp {
/// This is intentionally a class and not a struct since we need
/// to pass this by reference.
///
- public sealed class SourceFile : ISourceFile {
+ public class SourceFile : ISourceFile {
public readonly string Name;
public readonly string Path;
public readonly int Index;
- public SourceFileEntry SourceFileEntry;
+ public bool AutoGenerated;
+ public bool IsIncludeFile;
- public SourceFile (string name, string path, int index)
+ SourceFileEntry file;
+ byte[] guid, checksum;
+
+ public SourceFile (string name, string path, int index, bool is_include)
{
this.Index = index;
this.Name = name;
this.Path = path;
+ this.IsIncludeFile = is_include;
+ }
+
+ public SourceFileEntry SourceFileEntry {
+ get { return file; }
}
SourceFileEntry ISourceFile.Entry {
- get { return SourceFileEntry; }
+ get { return file; }
+ }
+
+ public void SetChecksum (byte[] guid, byte[] checksum)
+ {
+ this.guid = guid;
+ this.checksum = checksum;
+ }
+
+ public virtual void DefineSymbolInfo (MonoSymbolWriter symwriter)
+ {
+ if (guid != null)
+ file = symwriter.DefineDocument (Path, guid, checksum);
+ else {
+ file = symwriter.DefineDocument (Path);
+ if (AutoGenerated)
+ file.SetAutoGenerated ();
+ }
}
public override string ToString ()
@@ -46,6 +72,79 @@ namespace Mono.CSharp {
}
}
+ public class CompilationUnit : SourceFile, ICompileUnit
+ {
+ CompileUnitEntry comp_unit;
+ Hashtable include_files;
+ Hashtable conditionals;
+
+ public CompilationUnit (string name, string path, int index)
+ : base (name, path, index, false)
+ { }
+
+ public void AddFile (SourceFile file)
+ {
+ if (include_files == null)
+ include_files = new Hashtable ();
+
+ if (!include_files.Contains (file.Path))
+ include_files.Add (file.Path, file);
+ }
+
+ public void AddDefine (string value)
+ {
+ if (conditionals == null)
+ conditionals = new Hashtable (2);
+
+ conditionals [value] = true;
+ }
+
+ public void AddUndefine (string value)
+ {
+ if (conditionals == null)
+ conditionals = new Hashtable (2);
+
+ conditionals [value] = null;
+ }
+
+ CompileUnitEntry ICompileUnit.Entry {
+ get { return comp_unit; }
+ }
+
+ public CompileUnitEntry CompileUnitEntry {
+ get { return comp_unit; }
+ }
+
+ public override void DefineSymbolInfo (MonoSymbolWriter symwriter)
+ {
+ base.DefineSymbolInfo (symwriter);
+
+ comp_unit = symwriter.DefineCompilationUnit (SourceFileEntry);
+
+ if (include_files != null) {
+ foreach (SourceFile include in include_files.Values) {
+ include.DefineSymbolInfo (symwriter);
+ comp_unit.AddFile (include.SourceFileEntry);
+ }
+ }
+ }
+
+ public bool IsConditionalDefined (string value)
+ {
+ if (conditionals != null) {
+ object res = conditionals [value];
+ if (res != null)
+ return (bool)res;
+
+ // When conditional was undefined
+ if (conditionals.Contains (value))
+ return false;
+ }
+
+ return RootContext.IsConditionalDefined (value);
+ }
+ }
+
///
/// Keeps track of the location in the program
///
@@ -67,20 +166,24 @@ namespace Mono.CSharp {
struct Checkpoint {
public readonly int LineOffset;
+ public readonly int CompilationUnit;
public readonly int File;
- public Checkpoint (int file, int line)
+ public Checkpoint (int compile_unit, int file, int line)
{
File = file;
+ CompilationUnit = compile_unit;
LineOffset = line - (int) (line % (1 << line_delta_bits));
}
}
static ArrayList source_list;
+ static ArrayList compile_units;
static Hashtable source_files;
static int checkpoint_bits;
static int source_count;
static int current_source;
+ static int current_compile_unit;
static int line_delta_bits;
static int line_delta_mask;
static int column_bits;
@@ -95,7 +198,9 @@ namespace Mono.CSharp {
{
source_files = new Hashtable ();
source_list = new ArrayList ();
+ compile_units = new ArrayList ();
current_source = 0;
+ current_compile_unit = 0;
checkpoints = new Checkpoint [10];
}
@@ -103,7 +208,9 @@ namespace Mono.CSharp {
{
source_files = new Hashtable ();
source_list = new ArrayList ();
+ compile_units = new ArrayList ();
current_source = 0;
+ current_compile_unit = 0;
source_count = 0;
}
@@ -125,14 +232,15 @@ namespace Mono.CSharp {
}
source_files.Add (path, ++source_count);
- source_list.Add (new SourceFile (name, path, source_count));
+ CompilationUnit unit = new CompilationUnit (name, path, source_count);
+ source_list.Add (unit);
+ compile_units.Add (unit);
}
- static public SourceFile[] SourceFiles {
+ // IList
+ static public ArrayList SourceFiles {
get {
- SourceFile[] retval = new SourceFile [source_list.Count];
- source_list.CopyTo (retval, 0);
- return retval;
+ return compile_units;
}
}
@@ -146,7 +254,7 @@ namespace Mono.CSharp {
{
checkpoints = new Checkpoint [source_list.Count * 2];
if (checkpoints.Length > 0)
- checkpoints [0] = new Checkpoint (0, 0);
+ checkpoints [0] = new Checkpoint (0, 0, 0);
column_bits = 8;
column_mask = 0xFF;
@@ -159,16 +267,21 @@ namespace Mono.CSharp {
//
// This is used when we encounter a #line preprocessing directive.
//
- static public SourceFile LookupFile (string name)
+ static public SourceFile LookupFile (CompilationUnit comp_unit, string name)
{
- string path = name.Length == 0 ? "" : Path.GetFullPath (name);
+ string path;
+ if (!Path.IsPathRooted (name)) {
+ string root = Path.GetDirectoryName (comp_unit.Path);
+ path = Path.Combine (root, name);
+ } else
+ path = name;
if (!source_files.Contains (path)) {
if (source_count >= (1 << checkpoint_bits))
- return new SourceFile (name, path, 0);
+ return new SourceFile (name, path, 0, true);
source_files.Add (path, ++source_count);
- SourceFile retval = new SourceFile (name, path, source_count);
+ SourceFile retval = new SourceFile (name, path, source_count, true);
source_list.Add (retval);
return retval;
}
@@ -177,9 +290,10 @@ namespace Mono.CSharp {
return (SourceFile) source_list [index - 1];
}
- static public void Push (SourceFile file)
+ static public void Push (CompilationUnit compile_unit, SourceFile file)
{
- current_source = file.Index;
+ current_source = file != null ? file.Index : -1;
+ current_compile_unit = compile_unit != null ? compile_unit.Index : -1;
// File is always pushed before being changed.
}
@@ -190,9 +304,8 @@ namespace Mono.CSharp {
//
static public void DefineSymbolDocuments (MonoSymbolWriter symwriter)
{
- foreach (SourceFile file in source_list) {
- file.SourceFileEntry = symwriter.DefineDocument (file.Path);
- }
+ foreach (CompilationUnit unit in compile_units)
+ unit.DefineSymbolInfo (symwriter);
}
public Location (int row)
@@ -205,7 +318,9 @@ namespace Mono.CSharp {
if (row <= 0)
token = 0;
else {
- if (column > 255)
+ if (column > 254)
+ column = 254;
+ if (column < 0)
column = 255;
int target = -1;
int delta = 0;
@@ -222,7 +337,7 @@ namespace Mono.CSharp {
}
}
if (target == -1) {
- AddCheckpoint (current_source, row);
+ AddCheckpoint (current_compile_unit, current_source, row);
target = checkpoint_index;
delta = row % (1 << line_delta_bits);
}
@@ -233,14 +348,14 @@ namespace Mono.CSharp {
}
}
- static void AddCheckpoint (int file, int row)
+ static void AddCheckpoint (int compile_unit, int file, int row)
{
if (checkpoints.Length == ++checkpoint_index) {
Checkpoint [] tmp = new Checkpoint [checkpoint_index * 2];
Array.Copy (checkpoints, tmp, checkpoints.Length);
checkpoints = tmp;
}
- checkpoints [checkpoint_index] = new Checkpoint (file, row);
+ checkpoints [checkpoint_index] = new Checkpoint (compile_unit, file, row);
}
public override string ToString ()
@@ -286,7 +401,23 @@ namespace Mono.CSharp {
get {
if (token == 0)
return 1;
- return (int) (token & column_mask);
+ int col = (int) (token & column_mask);
+ return col == 255 ? 1 : col;
+ }
+ }
+
+ public bool Hidden {
+ get {
+ return (int) (token & column_mask) == 255;
+ }
+ }
+
+ public int CompilationUnitIndex {
+ get {
+ if (token == 0)
+ return 0;
+if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("Should not happen. Token is {0:X04}, checkpoints are {1}, index is {2}", token, checkpoints.Length, CheckpointIndex));
+ return checkpoints [CheckpointIndex].CompilationUnit;
}
}
@@ -319,6 +450,15 @@ if (checkpoints.Length <= CheckpointIndex) throw new Exception (String.Format ("
return (SourceFile) source_list [index - 1];
}
}
+
+ public CompilationUnit CompilationUnit {
+ get {
+ int index = CompilationUnitIndex;
+ if (index == 0)
+ return null;
+ return (CompilationUnit) source_list [index - 1];
+ }
+ }
}
public class LocatedToken