From ed2fac6a9e1b6f98e4847e1dda8c2a717d7a0b29 Mon Sep 17 00:00:00 2001
From: Stefan Huber <shuber2@gmail.com>
Date: Fri, 13 Jun 2008 15:14:08 +0200
Subject: [PATCH] fixing bug: parsing cond. breakpoint

---
 BreakpointsFrame.py | 2 +-
 Configuration.py    | 4 ++--
 GdbTerminal.py      | 5 ++---
 featurerequest.txt  | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/BreakpointsFrame.py b/BreakpointsFrame.py
index b3e0030..8450699 100644
--- a/BreakpointsFrame.py
+++ b/BreakpointsFrame.py
@@ -176,7 +176,7 @@ class BreakpointsFrame (StatusFrame.StatusFrame):
 			return
 
 
-		ifsplit = string.split(bpspec, "if")
+		ifsplit = string.split(bpspec, " if ")
 
 		if len(ifsplit)>1:
 			cond = ifsplit[1].strip()
diff --git a/Configuration.py b/Configuration.py
index 6f08a20..460b897 100644
--- a/Configuration.py
+++ b/Configuration.py
@@ -88,8 +88,8 @@ class Configuration:
 			print "Wrong breakpoint format:", tail
 			return
 
-		preif = string.split(tail, "if")[0].strip()
-		postif = string.join( string.split(tail, "if")[1:], "if").strip()
+		preif = string.split(tail, " if ")[0].strip()
+		postif = string.join( string.split(tail, " if ")[1:], " if ").strip()
 
 		[file,lineno] = string.split(preif, ":")
 		lineno = int(lineno)
diff --git a/GdbTerminal.py b/GdbTerminal.py
index 81a6300..ff6dc6b 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -104,8 +104,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 			#This line does not contain the file!
 			if not rxpos.search(line):
-				i += 1
-				line = bplines[i]
+				continue
 
 			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
@@ -114,7 +113,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]
-				pre,cond = string.split(line,"if")
+				cond = string.join(string.split(line," if ")[1:], " if ")
 				cond = cond.strip()
 
 			bpnts += [[no, file, lineno, cond]]
diff --git a/featurerequest.txt b/featurerequest.txt
index 72d6589..4d7f8bd 100644
--- a/featurerequest.txt
+++ b/featurerequest.txt
@@ -1,6 +1,5 @@
 Smaller requests
   - vim: do not add breakpoints when pressing F5, just replace them all
-  - error parsing conditional breakpoint from Entry
   - error when readreading the condition of breakpoints! (stop only if...)
 
 		(gdb) info breakpoints
-- 
2.30.2