[xbuild] ToolTask - add missing api

[mono.git] / mcs / ilasm / codegen / DebuggingInfo.cs

diff --git a/mcs/ilasm/codegen/DebuggingInfo.cs b/mcs/ilasm/codegen/DebuggingInfo.cs
index 23fcac2b771a0489b888ded70f2e16eab8c7872f..57ff6c643555eb7913c07da8772bf060977accf9 100644 (file)
--- a/mcs/ilasm/codegen/DebuggingInfo.cs
+++ b/mcs/ilasm/codegen/DebuggingInfo.cs
@@ -17,33 +17,33 @@ namespace Mono.ILASM {
 
        public class SymbolWriter : MonoSymbolWriter
        {
-               ArrayList sources;
                Mono.ILASM.SourceMethod current_method;
-               SourceFile current_source;
+               CompileUnitEntry current_source;
+               ArrayList methods;
 
                public SymbolWriter (string filename)
                        : base (filename)
                {
-                       sources = new ArrayList ();
+                       methods = new ArrayList ();
                }
 
-               public Mono.ILASM.SourceMethod BeginMethod (MethodDef method, Location location)
+               public Mono.ILASM.SourceMethod BeginMethod (MethodDef method, Location start)
                {
-                       current_method = new Mono.ILASM.SourceMethod (method, location);
-                       current_source.AddMethod (current_method);
+                       current_method = new Mono.ILASM.SourceMethod (current_source, method, start);
+                       methods.Add (current_method);
                        return current_method;
                }
 
-               public void EndMethod (Location location)
+               public void EndMethod (Location end)
                {
-                       current_method.EndLine = location.line;
+                       current_method.EndLine = end.line;
                        current_method = null;
                }
 
                public void BeginSourceFile (string filename)
                {
-                       current_source = new SourceFile (file, filename);
-                       sources.Add (current_source);
+                       SourceFileEntry file = DefineDocument (filename, null, null);
+                       current_source = DefineCompilationUnit (file);
                }
 
                public void EndSourceFile ()
@@ -53,41 +53,23 @@ namespace Mono.ILASM {
 
                public void Write (Guid guid)
                {
-                       foreach (SourceFile source in sources)
-                               source.Write ();
+                       foreach (Mono.ILASM.SourceMethod method in methods)
+                               method.Write (this);
 
                        WriteSymbolFile (guid);
                }
        }
 
-       public class SourceFile : SourceFileEntry
-       {
-               private ArrayList methods = new ArrayList ();
-
-               public SourceFile (MonoSymbolFile file, string filename)
-                       : base (file, filename)
-               { }
-
-               public void AddMethod (SourceMethod method)
-               {
-                       methods.Add (method);
-               }
-
-               public void Write ()
-               {
-                       foreach (SourceMethod method in methods)
-                               method.Write (this);
-               }
-       }
-
-       public class SourceMethod
+       public class SourceMethod : IMethodDef
        {
+               CompileUnitEntry file;
                MethodDef method;
                ArrayList lines;
                public int StartLine, EndLine;
 
-               public SourceMethod (MethodDef method, Location start)
+               public SourceMethod (CompileUnitEntry file, MethodDef method, Location start)
                {
+                       this.file = file;
                        this.method = method;
                        this.StartLine = start.line;
 
@@ -95,23 +77,31 @@ namespace Mono.ILASM {
                        MarkLocation (start.line, 0);
                }
 
+               public string Name {
+                       get { return method.Name; }
+               }
+
+               public int Token {
+                       get {
+                               PEAPI.MethodDef pemethod = method.PeapiMethodDef;
+                               return (int) (((uint) PEAPI.MDTable.Method << 24) | pemethod.Row);
+                       }
+               }
+
                public void MarkLocation (int line, uint offset)
                {
-                       lines.Add (new LineNumberEntry (line, (int) offset));
+                       lines.Add (new LineNumberEntry (0, line, (int) offset));
                }
 
-               public void Write (SourceFile file)
+               public void Write (MonoSymbolWriter writer)
                {
-                       PEAPI.MethodDef pemethod = method.PeapiMethodDef;
-
-                       LineNumberEntry[] lne = new LineNumberEntry [lines.Count];
-                       lines.CopyTo (lne);
+                       LineNumberEntry[] the_lines = new LineNumberEntry [lines.Count];
+                       lines.CopyTo (the_lines, 0);
 
-                       uint token = ((uint) PEAPI.MDTable.Method << 24) | pemethod.Row;
+                       LocalVariableEntry[] locals = method.GetLocalVars ();
 
-                       file.DefineMethod (
-                               method.Name, (int) token, null, lne, null,
-                               StartLine, EndLine, 0);
+                       MethodEntry entry = writer.SymbolFile.DefineMethod (
+                               file, Token, null, locals, the_lines, null, null, 0, 0);
                }
        }
 }