X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=GdbTerminal.py;h=5be9c05fd165108449fd97150b6712762ee67350;hp=ff6dc6b37356133c8d526fbb1f02f9f0dd6c9d3a;hb=382465d6c2f07b99c0263314405d1d8411072d23;hpb=379760912de740354f07f223b308d5092c0700ad

diff --git a/GdbTerminal.py b/GdbTerminal.py
index ff6dc6b..5be9c05 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -43,9 +43,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	def setPty(self, pty):
 		ttyname = os.ttyname(pty)
-		len = self.getHistoryLen()
-		self.feed_child("set inferior-tty %s\n" % (ttyname,))
-		self.waitForPrompt(len)
+		self.__getAnswerFromCmd("set inferior-tty %s\n" % (ttyname,))
 
 	def setBreakpoint(self, file, lineno, condition=None):
 		his = self.getHistoryLen()
@@ -74,22 +72,18 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def delBreakpoint(self, breakpoint):
-		his = self.getHistoryLen()
-		self.feed_child("del breakpoint %s\n" % (breakpoint,))
-		self.waitForPrompt(his)
+		self.__getAnswerFromCmd("del breakpoint %s\n" % (breakpoint,))
+
 
 	def getBreakpoints(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("info breakpoints\n")
-		endhis, response = self.waitForPrompt(starthis)
+		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		rxbp = re.compile("^\d+\s+breakpoint")
 		rxpos = re.compile("^.* at \S+:\d+$")
 		rxcond = re.compile("^\tstop only if")
 
 		bpnts = []
-		bplines = self.history[starthis+1:endhis]
-		i = 0
+		i = 1
 
 		#Parse the resulting lines
 		while i<len(bplines):
@@ -124,11 +118,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def getExpression(self, expr):
-
-		his = self.getHistoryLen()
-		self.feed_child("print " + expr + "\n")
-		his, response = self.waitForPrompt(his)
-		answer = self.history[his-1]
+		answer = self.__getAnswerFromCmd("print " + expr + "\n")
+		answer = answer[-1]
 
 		if len(string.split(answer, "=")) == 1:
 			return answer.strip()
@@ -138,18 +129,24 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	
 	def listCodeSnippet(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("list\n")
-		endhis, response = self.waitForPrompt(starthis)
-
-		text = string.join(self.history[starthis:endhis], "\n")
-		return text
+		answ = self.__getAnswerFromCmd("list\n")
+		return string.join(answ, "\n")
 
+	def getBacktrace(self):
+		answ = self.__getAnswerFromCmd("bt\n")
+		return string.join(answ, "\n")
 
 	def waitForPrompt(self, his):
 		rx = "^\(gdb\)"
 		return self.waitForRx(rx,his)
 
+	def __getAnswerFromCmd(self, cmd):
+		starthis = self.getHistoryLen()
+		self.feed_child(cmd)
+		endhis, response = self.waitForPrompt(starthis)
+
+		return self.history[starthis:endhis]
+
 
 	def testForActivity(self, his):
 		"""Test whether debugger got active again"""