Author: martin
Date: 2006-04-17 21:38:53 -0400 (Mon, 17 Apr 2006)
New Revision: 59565
Removed:
trunk/debugger/interfaces/ISourceBuffer.cs
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/DwarfReader.cs
trunk/debugger/classes/AssemblerMethod.cs
trunk/debugger/classes/MethodSource.cs
trunk/debugger/classes/SourceBuffer.cs
trunk/debugger/classes/SourceFileFactory.cs
trunk/debugger/frontend/ScriptingContext.cs
trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ISourceBuffer.cs: Removed.
(ISourceBuffer): Removed this interface; `SourceBuffer' is the
only class implementing it.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 01:36:05 UTC (rev 59564)
+++ trunk/debugger/ChangeLog 2006-04-18 01:38:53 UTC (rev 59565)
@@ -1,5 +1,11 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * interfaces/ISourceBuffer.cs: Removed.
+ (ISourceBuffer): Removed this interface; `SourceBuffer' is the
+ only class implementing it.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* interfaces/ITargetMemoryAccess.cs: Removed.
(ITargetMemoryAccess): Removed.
Modified: trunk/debugger/arch/DwarfReader.cs
===================================================================
--- trunk/debugger/arch/DwarfReader.cs 2006-04-18 01:36:05 UTC (rev 59564)
+++ trunk/debugger/arch/DwarfReader.cs 2006-04-18 01:38:53 UTC (rev 59565)
@@ -2408,7 +2408,7 @@
DwarfTargetMethodSource msource;
int start_row, end_row;
LineNumber[] lines;
- ISourceBuffer buffer;
+ SourceBuffer buffer;
public DwarfTargetMethod (DieSubprogram subprog,
LineNumberEngine engine)
: base (subprog.Name, subprog.ImageFile,
subprog.dwarf.module)
@@ -2466,7 +2466,7 @@
get { return source; }
}
- public ISourceBuffer SourceBuffer {
+ public SourceBuffer SourceBuffer {
get { return buffer; }
}
Modified: trunk/debugger/classes/AssemblerMethod.cs
===================================================================
--- trunk/debugger/classes/AssemblerMethod.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/classes/AssemblerMethod.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -32,7 +32,7 @@
public sealed class AssemblerMethod : MethodSource
{
- ISourceBuffer buffer;
+ SourceBuffer buffer;
int start_row;
int end_row;
Module module;
Modified: trunk/debugger/classes/MethodSource.cs
===================================================================
--- trunk/debugger/classes/MethodSource.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/classes/MethodSource.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -70,7 +70,7 @@
}
}
- public ISourceBuffer SourceBuffer {
+ public SourceBuffer SourceBuffer {
get {
return SourceData.SourceBuffer;
}
@@ -193,16 +193,16 @@
public readonly int EndRow;
public readonly LineEntry[] Addresses;
public readonly SourceMethod SourceMethod;
- public readonly ISourceBuffer SourceBuffer;
+ public readonly SourceBuffer SourceBuffer;
public readonly Module Module;
public MethodSourceData (int start, int end,
LineEntry[] addresses,
- ISourceBuffer buffer, Module
module)
+ SourceBuffer buffer, Module
module)
: this (start, end, addresses, null, buffer,
module)
{ }
public MethodSourceData (int start, int end,
LineEntry[] addresses,
- SourceMethod method,
ISourceBuffer buffer,
+ SourceMethod method,
SourceBuffer buffer,
Module module)
{
this.StartRow = start;
Modified: trunk/debugger/classes/SourceBuffer.cs
===================================================================
--- trunk/debugger/classes/SourceBuffer.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/classes/SourceBuffer.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -5,7 +5,7 @@
namespace Mono.Debugger
{
[Serializable]
- public class SourceBuffer : ISourceBuffer
+ public class SourceBuffer
{
string name;
string[] contents;
Modified: trunk/debugger/classes/SourceFileFactory.cs
===================================================================
--- trunk/debugger/classes/SourceFileFactory.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/classes/SourceFileFactory.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -10,10 +10,10 @@
{
Hashtable files = new Hashtable ();
- public ISourceBuffer FindFile (string name)
+ public SourceBuffer FindFile (string name)
{
if (files.Contains (name))
- return (ISourceBuffer) ((ObjectCache) files
[name]).Data;
+ return (SourceBuffer) ((ObjectCache) files
[name]).Data;
ObjectCache cache = (ObjectCache) files [name];
if (cache == null) {
@@ -21,7 +21,7 @@
files.Add (name, cache);
}
- return (ISourceBuffer) cache.Data;
+ return (SourceBuffer) cache.Data;
}
public bool Exists (string name)
Modified: trunk/debugger/frontend/ScriptingContext.cs
===================================================================
--- trunk/debugger/frontend/ScriptingContext.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/frontend/ScriptingContext.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -281,7 +281,7 @@
} else
start = last_line;
} else {
- ISourceBuffer buffer;
+ SourceBuffer buffer;
if (location.HasSourceFile) {
string filename =
location.SourceFile.FileName;
@@ -550,7 +550,7 @@
Print ("{0,4} {1}", source.ID,
source.FileName);
}
- public ISourceBuffer FindFile (string filename)
+ public SourceBuffer FindFile (string filename)
{
Process process = GetProcess ();
return process.SourceFileFactory.FindFile (filename);
Deleted: trunk/debugger/interfaces/ISourceBuffer.cs
===================================================================
--- trunk/debugger/interfaces/ISourceBuffer.cs 2006-04-18 01:36:05 UTC (rev
59564)
+++ trunk/debugger/interfaces/ISourceBuffer.cs 2006-04-18 01:38:53 UTC (rev
59565)
@@ -1,31 +0,0 @@
-using System;
-using System.IO;
-
-namespace Mono.Debugger
-{
- // <summary>
- // This is a source code buffer which can be displayed by a
- // source code viewer.
- //
- // A source code debugger can either belong to a file on
- // disk or be implicitly generated, for instance as the
- // result of disassembling a function.
- // </summary>
- public interface ISourceBuffer
- {
- // <summary>
- // The name of this buffer.
- // </summary>
- string Name {
- get;
- }
-
- // <summary>
- // The whole contents of this buffer. This is what
- // a source code viewer should display.
- // </summary>
- string[] Contents {
- get;
- }
- }
-}
Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 01:36:05 UTC
(rev 59564)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 01:38:53 UTC
(rev 59565)
@@ -982,7 +982,7 @@
LineEntry[] addresses = new LineEntry
[lines.Count];
lines.CopyTo (addresses, 0);
- ISourceBuffer buffer = factory.FindFile
(source_method.SourceFile.FileName);
+ SourceBuffer buffer = factory.FindFile
(source_method.SourceFile.FileName);
return new MethodSourceData (
start_row, end_row, addresses,
source_method, buffer,
source_method.SourceFile.Module);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
