X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=BreakpointsFrame.py;h=9b709b403ea610f9721b841f1a1fb427ef75a079;hp=3216de661c4ed21ae8b55730a2a7003e7bf8bb31;hb=cfcc39662a53b6f7a77c7ec8f05478227c5f137f;hpb=d5dc6369fca636f78c76f0f95aefb9817289e27f

diff --git a/BreakpointsFrame.py b/BreakpointsFrame.py
index 3216de6..9b709b4 100644
--- a/BreakpointsFrame.py
+++ b/BreakpointsFrame.py
@@ -92,7 +92,8 @@ class BreakpointsFrame (gtk.Frame):
 
 
 		bpspec = self.bpEntry.get_text()
-		rx = re.compile("^[\w\._\-]+:\d+\s*(\sif\s+\S+.*)?$")
+		bpspec = bpspec.strip()
+		rx = re.compile("^[\w\._\-]+:\d+(\s+if\s+\S+.*)?$")
 
 		#Check if format is correct
 		if not rx.search(bpspec):
@@ -115,12 +116,16 @@ class BreakpointsFrame (gtk.Frame):
 		pos = ifsplit[0].strip()	
 		[file,lineno] = string.split(pos, ":")
 
-		pos = self.debugger.setBreakpoint(file, lineno, cond)
+		self.addBreakpoint(file, lineno, cond)
+	
+
+
+	def addBreakpoint(self, file, lineno, cond=None):
 
-		if pos!=None:
-			iter = self.model.append()
-			self.model.set(iter, 0, pos)
-			self.model.set(iter, 1, bpspec)
+		no = self.debugger.setBreakpoint(file, lineno, cond)
+
+		if no!=None:
+			self.addBreakpointToList(no, file, lineno, cond)
 		else:
 			dialog = gtk.MessageDialog(None, \
 				gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, \
@@ -128,10 +133,19 @@ class BreakpointsFrame (gtk.Frame):
 				"Invalid specification!") 
 			dialog.run()
 			dialog.destroy()
-			return
 
 
 
+	def addBreakpointToList(self, no, file, lineno, cond=None):
+		iter = self.model.append()
+		self.model.set(iter, 0, no)
+
+		if cond==None:
+			self.model.set(iter, 1, "%s:%s" % (str(file), str(lineno)))
+		else:
+			self.model.set(iter, 1, "%s:%s if %s" % (str(file), str(lineno), str(cond)))
+
+
 
 	def delBtnClicked(self, btn):
 
@@ -169,13 +183,7 @@ class BreakpointsFrame (gtk.Frame):
 
 		for bp in bpnts:
 			[no, file, lineno, cond] = bp
-			iter = self.model.append()
-			self.model.set(iter, 0, no)
-
-			if cond==None:
-				self.model.set(iter, 1, "%s:%s" % (file, lineno))
-			else:
-				self.model.set(iter, 1, "%s:%s if %s" % (file, lineno, cond))
+			self.addBreakpointToList(no, file, lineno, cond)