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):
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, \
"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):
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)