From e29bdf17d1b4fb1ca32553dfef5fe889643b95ee Mon Sep 17 00:00:00 2001
From: Mark Florisson <markflorisson88@gmail.com>
Date: Mon, 1 Nov 2010 23:17:28 +0100
Subject: [PATCH] Added commands 'cy cont' and 'cy step'

---
 Cython/Debugger/libcython.py | 28 ++++++++++++++++++++++++++++
 Cython/Debugger/libpython.py | 28 ++++++++++++++++------------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/Cython/Debugger/libcython.py b/Cython/Debugger/libcython.py
index dac01842..81425d00 100644
--- a/Cython/Debugger/libcython.py
+++ b/Cython/Debugger/libcython.py
@@ -452,6 +452,8 @@ class CyCy(CythonCommand):
             break_ = CyBreak.register(),
             step = CyStep.register(),
             next = CyNext.register(),
+            run = CyRun.register(),
+            cont = CyCont.register(),
             list = CyList.register(),
             print_ = CyPrint.register(),
             locals = CyLocals.register(),
@@ -705,6 +707,32 @@ class CyNext(CythonCodeStepper):
         super(CythonCodeStepper, self).invoke(*args, **kwargs)
 
 
+class CyRun(CythonCodeStepper):
+    """
+    Run a Cython program. This is like the 'run' command, except that it 
+    displays Cython or Python source lines as well
+    """
+    
+    name = 'cy run'
+    
+    def invoke(self, *args):
+        self.result = gdb.execute('run', to_string=True)
+        self.end_stepping()
+
+
+class CyCont(CythonCodeStepper):
+    """
+    Continue a Cython program. This is like the 'run' command, except that it 
+    displays Cython or Python source lines as well.
+    """
+    
+    name = 'cy cont'
+    
+    def invoke(self, *args):
+        self.result = gdb.execute('cont', to_string=True)
+        self.end_stepping()
+
+
 class CyList(CythonCommand):
     """
     List Cython source code. To disable to customize colouring see the cy_*
diff --git a/Cython/Debugger/libpython.py b/Cython/Debugger/libpython.py
index 0ed013a8..12195438 100644
--- a/Cython/Debugger/libpython.py
+++ b/Cython/Debugger/libpython.py
@@ -1542,29 +1542,29 @@ class GenericCodeStepper(gdb.Command):
     depending on the 'stepper' argument.
     """
     
+    stepper = False
+    
     def __init__(self, name, stepper=False):
         super(GenericCodeStepper, self).__init__(name, 
                                                  gdb.COMMAND_RUNNING,
                                                  gdb.COMPLETE_NONE)
         self.stepper = stepper
     
-    def _init_stepping(self):
+    def init_stepping(self):
         self.beginframe = gdb.selected_frame()
         self.beginline = self.lineno(self.beginframe)
         if not self.stepper:
             self.depth = self._stackdepth(self.beginframe)
 
-    def _next_step(self, gdb_command):
+    def next_step(self, gdb_command):
         """
         Teturns whether to continue stepping. This method sets the instance 
-        attributes 'result' and 'stopped_running'. 'result' hold the output
-        of the executed gdb command ('step' or 'next')
+        attribute 'result'. 'result' hold the output of the executed gdb 
+        command ('step' or 'next')
         """
         self.result = gdb.execute(gdb_command, to_string=True)
-        self.stopped_running = gdb.inferiors()[0].pid == 0
         
-        if self.stopped_running:
-            # We stopped running
+        if self.stopped():
             return False
             
         newframe = gdb.selected_frame()
@@ -1586,8 +1586,9 @@ class GenericCodeStepper(gdb.Command):
         
         return not (hit_breakpoint or new_lineno or is_relevant_function)
         
-    def _end_stepping(self):
-        if self.stopped_running:
+    def end_stepping(self):
+        "requires that the instance attribute self.result is set"
+        if self.stopped():
             sys.stdout.write(self.result)
         else:
             frame = gdb.selected_frame()
@@ -1598,6 +1599,9 @@ class GenericCodeStepper(gdb.Command):
                 else:
                     print output
     
+    def stopped(self):
+        return gdb.inferiors()[0].pid == 0
+        
     def _stackdepth(self, frame):
         depth = 0
         while frame:
@@ -1618,11 +1622,11 @@ class GenericCodeStepper(gdb.Command):
             gdb_command= 'next'
         
         for nthstep in xrange(nsteps):
-            self._init_stepping()
-            while self._next_step(gdb_command):
+            self.init_stepping()
+            while self.next_step(gdb_command):
                 pass
             
-            self._end_stepping()
+            self.end_stepping()
 
 
 class PythonCodeStepper(GenericCodeStepper):
-- 
2.26.2