From e6966c2a2aa2450d0adb57acd37cb3285adfbd75 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Wed, 19 Mar 2014 18:16:23 +0000
Subject: [PATCH] Debugger: refactor

git-svn-id: trunk@44473 -
---
 components/debuggerintf/dbgintfdebuggerbase.pp |  7 ++++++-
 debugger/test/Gdbmi/testbase.pas               | 16 ++++++++--------
 debugger/test/Gdbmi/testdisass.pas             | 10 +++++-----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/components/debuggerintf/dbgintfdebuggerbase.pp b/components/debuggerintf/dbgintfdebuggerbase.pp
index 72428e9c93..35a68803f9 100644
--- a/components/debuggerintf/dbgintfdebuggerbase.pp
+++ b/components/debuggerintf/dbgintfdebuggerbase.pp
@@ -725,7 +725,7 @@ type
     function CreateEntry: TDbgEntityValue; override;
   public
     procedure Add(const AName, AValue: String);
-    procedure SetDataValidity(AValidity: TDebuggerDataState); virtual; abstract;
+    procedure SetDataValidity(AValidity: TDebuggerDataState); virtual;
   public
     function Count: Integer;reintroduce; virtual;
     property Entries[AnIndex: Integer]: TLocalsValue read GetEntry;
@@ -2362,6 +2362,11 @@ begin
   inherited Add(v);
 end;
 
+procedure TLocals.SetDataValidity(AValidity: TDebuggerDataState);
+begin
+  //
+end;
+
 function TLocals.Count: Integer;
 begin
   Result := inherited Count;
diff --git a/debugger/test/Gdbmi/testbase.pas b/debugger/test/Gdbmi/testbase.pas
index 47d9aae13a..bc12b82230 100644
--- a/debugger/test/Gdbmi/testbase.pas
+++ b/debugger/test/Gdbmi/testbase.pas
@@ -220,8 +220,8 @@ type
     //FSignals: TBaseSignals;
     //FBreakPoints: TIDEBreakPoints;
     //FBreakPointGroups: TIDEBreakPointGroups;
-    FLocals: TIdeLocalsMonitor;
-    FLineInfo: TIDELineInfo;
+    FLocals: TLocalsMonitor;
+    FLineInfo: TBaseLineInfo;
     FWatches: TIdeWatchesMonitor;
     FThreads: TThreadsMonitor;
     FRegisters: TRegistersMonitor;
@@ -295,8 +295,8 @@ type
     property Exceptions: TBaseExceptions read FExceptions;      // A list of exceptions we should ignore
     property CallStack: TTestCallStackMonitor read FCallStack;
     property Disassembler: TBaseDisassembler read FDisassembler;
-    property Locals: TIdeLocalsMonitor read FLocals;
-    property LineInfo: TIDELineInfo read FLineInfo;
+    property Locals: TLocalsMonitor read FLocals;
+    property LineInfo: TBaseLineInfo read FLineInfo;
     property Registers: TRegistersMonitor read FRegisters;
     //property Signals: TBaseSignals read FSignals;               // A list of actions for signals we know of
     property Watches: TIdeWatchesMonitor read FWatches;
@@ -558,8 +558,8 @@ begin
   FThreads := TThreadsMonitor.Create;
   FExceptions := TBaseExceptions.Create(TBaseException);
   //FSignals := TBaseSignals.Create(TBaseSignal);
-  FLocals := TIdeLocalsMonitor.Create;
-  FLineInfo := TIDELineInfo.Create;
+  FLocals := TLocalsMonitor.Create;
+  FLineInfo := TBaseLineInfo.Create;
   FCallStack := TTestCallStackMonitor.Create;
   FDisassembler := TBaseDisassembler.Create;
   FRegisters := TRegistersMonitor.Create;
@@ -572,7 +572,7 @@ begin
   FWatches.Supplier := Result.Watches;
   FThreads.Supplier := Result.Threads;
   FLocals.Supplier := Result.Locals;
-  FLineInfo.Master := Result.LineInfo;
+  //FLineInfo.Master := Result.LineInfo;
   FCallStack.Supplier := Result.CallStack;
   //FDisassembler.Master := Result.Disassembler;
   Result.Exceptions := FExceptions;
@@ -595,7 +595,7 @@ begin
   FWatches.Supplier := nil;
   FThreads.Supplier := nil;
   FLocals.Supplier := nil;
-  FLineInfo.Master := nil;
+  //FLineInfo.Master := nil;
   FCallStack.Supplier := nil;
   //FDisassembler.Master := nil;
   //FExceptions.Master := nil;
diff --git a/debugger/test/Gdbmi/testdisass.pas b/debugger/test/Gdbmi/testdisass.pas
index c9e4477353..77f171fb57 100644
--- a/debugger/test/Gdbmi/testdisass.pas
+++ b/debugger/test/Gdbmi/testdisass.pas
@@ -47,8 +47,8 @@ type
     //FSignals: TBaseSignals;
     //FBreakPoints: TIDEBreakPoints;
     //FBreakPointGroups: TIDEBreakPointGroups;
-    FLocals: TIdeLocalsMonitor;
-    FLineInfo: TIDELineInfo;
+    FLocals: TLocalsMonitor;
+    FLineInfo: TBaseLineInfo;
     FWatches: TIdeWatchesMonitor;
     FThreads: TThreadsMonitor;
     FRegisters: TRegistersMonitor;
@@ -340,8 +340,8 @@ var
     FThreads := TThreadsMonitor.Create;
     FExceptions := TBaseExceptions.Create(TBaseException);
     //FSignals := TBaseSignals.Create(TBaseSignal);
-    FLocals := TIdeLocalsMonitor.Create;
-    FLineInfo := TIDELineInfo.Create;
+    FLocals := TLocalsMonitor.Create;
+    FLineInfo := TBaseLineInfo.Create;
     FCallStack := TTestCallStackMonitor.Create;
     FRegisters := TRegistersMonitor.Create;
 
@@ -349,7 +349,7 @@ var
     FWatches.Supplier := Gdb.Watches;
     FThreads.Supplier := Gdb.Threads;
     FLocals.Supplier := Gdb.Locals;
-    FLineInfo.Master := Gdb.LineInfo;
+    //FLineInfo.Master := Gdb.LineInfo;
     FCallStack.Supplier := Gdb.CallStack;
     Gdb.Exceptions := FExceptions;
     //FSignals.Master := Gdb.Signals;