From 0375286dcfffb0cbb50e75112ddd66cea3249ca9 Mon Sep 17 00:00:00 2001
From: Riccardo Mottola <rm@gnu.org>
Date: Tue, 22 Jun 2021 01:49:12 +0200
Subject: [PATCH] generalize gdb version to debugger version

---
 Modules/Debuggers/ProjectCenter/PCDebugger.h   |  6 +++---
 Modules/Debuggers/ProjectCenter/PCDebugger.m   | 14 +++++++++-----
 Modules/Debuggers/ProjectCenter/PipeDelegate.m |  6 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.h b/Modules/Debuggers/ProjectCenter/PCDebugger.h
index ef01297..7f649d4 100644
--- a/Modules/Debuggers/ProjectCenter/PCDebugger.h
+++ b/Modules/Debuggers/ProjectCenter/PCDebugger.h
@@ -45,7 +45,7 @@ extern NSString *PCDBDebuggerStartedNotification;
   NSString       *executablePath;
   NSString       *debuggerPath;
   int            subProcessId;
-  float          gdbVersion;
+  float          debuggerVersion;
   NSDictionary   *lastInfoParsed;
   NSString       *lastFileNameParsed;
   NSUInteger     lastLineNumberParsed;
@@ -59,8 +59,8 @@ extern NSString *PCDBDebuggerStartedNotification;
 - (void) interrupt;
 - (int) subProcessId;
 - (void) setSubProcessId:(int)pid;
-- (float) gdbVersion;
-- (void) setGdbVersion:(float)ver;
+- (float) debuggerVersion;
+- (void) setDebuggerVersion:(float)ver;
 - (NSDictionary *)lastInfoParsed;
 - (void)setSetInfoParsed: (NSDictionary *)dict;
 - (NSString *)lastFileNameParsed;
diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.m b/Modules/Debuggers/ProjectCenter/PCDebugger.m
index 8ffc29b..2ac5776 100644
--- a/Modules/Debuggers/ProjectCenter/PCDebugger.m
+++ b/Modules/Debuggers/ProjectCenter/PCDebugger.m
@@ -156,7 +156,11 @@ NSString *PCDBDebuggerStartedNotification = @"PCDBDebuggerStartedNotification";
       [debuggerView setFont: [self consoleFont]];
 
       subProcessId = 0;
-      gdbVersion = 0.0;
+      debuggerVersion = 0.0;
+
+      lastInfoParsed = nil;
+      lastFileNameParsed = nil;
+      lastLineNumberParsed = NSNotFound;
 
       breakpoints = nil;
 
@@ -277,14 +281,14 @@ NSString *PCDBDebuggerStartedNotification = @"PCDBDebuggerStartedNotification";
   subProcessId = pid;
 }
 
-- (float) gdbVersion
+- (float) debuggerVersion
 {
-  return gdbVersion;
+  return debuggerVersion;
 }
 
-- (void) setGdbVersion:(float)ver
+- (void) setDebuggerVersion:(float)ver
 {
-  gdbVersion = ver;
+  debuggerVersion = ver;
 }
 
 - (NSDictionary *)lastInfoParsed
diff --git a/Modules/Debuggers/ProjectCenter/PipeDelegate.m b/Modules/Debuggers/ProjectCenter/PipeDelegate.m
index c5717a3..bc6e553 100644
--- a/Modules/Debuggers/ProjectCenter/PipeDelegate.m
+++ b/Modules/Debuggers/ProjectCenter/PipeDelegate.m
@@ -289,7 +289,7 @@
   [stringScanner scanString: @"~" intoString: &prefix];
   if(prefix != nil)
     {
-      if ([debugger gdbVersion] == 0.0)
+      if ([debugger debuggerVersion] == 0.0)
         {
           NSString *str1 = nil;
           NSString *str2 = nil;
@@ -307,11 +307,11 @@
               if ([stringScanner scanFloat:&v])
                 {
                   NSLog(@"GDB version string: %f", v);
-                  [debugger setGdbVersion:v];
+                  [debugger setDebuggerVersion:v];
                 }
             }
         }
-      if (([debugger gdbVersion] < 7) && [debugger subProcessId] == 0)
+      if (([debugger debuggerVersion] < 7) && [debugger subProcessId] == 0)
         {
           NSString *str1;
           // we attempt to parse: [New thread 6800.0x18ec]