From 5beb3dfe39bea66c0c16aeeb5acdb3bc368b8adf Mon Sep 17 00:00:00 2001
From: Riccardo Mottola <rm@gnu.org>
Date: Mon, 5 Jul 2021 01:07:16 +0200
Subject: [PATCH] move debugger version into the wrapper

---
 Modules/Debuggers/ProjectCenter/GDBWrapper.h |  4 ++++
 Modules/Debuggers/ProjectCenter/GDBWrapper.m | 13 ++++++++++++-
 Modules/Debuggers/ProjectCenter/PCDebugger.h |  3 ---
 Modules/Debuggers/ProjectCenter/PCDebugger.m | 12 ------------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Modules/Debuggers/ProjectCenter/GDBWrapper.h b/Modules/Debuggers/ProjectCenter/GDBWrapper.h
index 3bdef14..a672ceb 100644
--- a/Modules/Debuggers/ProjectCenter/GDBWrapper.h
+++ b/Modules/Debuggers/ProjectCenter/GDBWrapper.h
@@ -59,8 +59,12 @@ typedef enum PCDebuggerOutputType_enum {
   NSFont  *font;
 
   BOOL debuggerStarted;
+  float          debuggerVersion;
 }
 
+- (float) debuggerVersion;
+- (void) setDebuggerVersion:(float)ver;
+
 - (void)logStdOut:(NSNotification *)aNotif;
 
 - (void)logErrOut:(NSNotification *)aNotif;
diff --git a/Modules/Debuggers/ProjectCenter/GDBWrapper.m b/Modules/Debuggers/ProjectCenter/GDBWrapper.m
index b9fea88..7c1c4cd 100644
--- a/Modules/Debuggers/ProjectCenter/GDBWrapper.m
+++ b/Modules/Debuggers/ProjectCenter/GDBWrapper.m
@@ -56,6 +56,7 @@
       promptColor = [[NSColor purpleColor] retain];
       
       debuggerStarted = NO;
+      debuggerVersion = 0.0;
     }
   return self;
 }
@@ -121,6 +122,16 @@
   return errorColor;
 }
 
+- (float) debuggerVersion
+{
+  return debuggerVersion;
+}
+
+- (void) setDebuggerVersion:(float)ver
+{
+  debuggerVersion = ver;
+}
+
 /**
  * Log string to the view.
  */
@@ -347,7 +358,7 @@
   [stringScanner scanString: @"~" intoString: &prefix];
   if(prefix != nil)
     {
-      if ([debugger debuggerVersion] == 0.0)
+      if (debuggerVersion == 0.0)
         {
           NSString *str1 = nil;
           NSString *str2 = nil;
diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.h b/Modules/Debuggers/ProjectCenter/PCDebugger.h
index 7f649d4..d92f047 100644
--- a/Modules/Debuggers/ProjectCenter/PCDebugger.h
+++ b/Modules/Debuggers/ProjectCenter/PCDebugger.h
@@ -45,7 +45,6 @@ extern NSString *PCDBDebuggerStartedNotification;
   NSString       *executablePath;
   NSString       *debuggerPath;
   int            subProcessId;
-  float          debuggerVersion;
   NSDictionary   *lastInfoParsed;
   NSString       *lastFileNameParsed;
   NSUInteger     lastLineNumberParsed;
@@ -59,8 +58,6 @@ extern NSString *PCDBDebuggerStartedNotification;
 - (void) interrupt;
 - (int) subProcessId;
 - (void) setSubProcessId:(int)pid;
-- (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 52e4b90..de27369 100644
--- a/Modules/Debuggers/ProjectCenter/PCDebugger.m
+++ b/Modules/Debuggers/ProjectCenter/PCDebugger.m
@@ -156,8 +156,6 @@ NSString *PCDBDebuggerStartedNotification = @"PCDBDebuggerStartedNotification";
       [debuggerView setFont: [self consoleFont]];
 
       subProcessId = 0;
-      debuggerVersion = 0.0;
-
       lastInfoParsed = nil;
       lastFileNameParsed = nil;
       lastLineNumberParsed = NSNotFound;
@@ -281,16 +279,6 @@ NSString *PCDBDebuggerStartedNotification = @"PCDBDebuggerStartedNotification";
   subProcessId = pid;
 }
 
-- (float) debuggerVersion
-{
-  return debuggerVersion;
-}
-
-- (void) setDebuggerVersion:(float)ver
-{
-  debuggerVersion = ver;
-}
-
 - (NSDictionary *)lastInfoParsed
 {
   return lastInfoParsed;