[pypy-svn] r10241 - in pypy/dist: goal pypy/translator/tool/pygame

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Apr  1 21:03:54 2005
New Revision: 10241

Modified:
   pypy/dist/goal/translate_pypy.py
   pypy/dist/pypy/translator/tool/pygame/graphdisplay.py
Log:
start of infrastructure to support commands at the translate_pypy debug prompt to pick graphs to show



Modified: pypy/dist/goal/translate_pypy.py
==============================================================================
--- pypy/dist/goal/translate_pypy.py	(original)
+++ pypy/dist/goal/translate_pypy.py	Fri Apr  1 21:03:54 2005
@@ -216,9 +216,51 @@
 
         display = GraphDisplay(get_layout(TranslatorPage(t)))
         async_quit = display.async_quit
-        return display.run, async_quit, pygame.quit
+        def show(page):
+            display.async_cmd(layout=get_layout(page))
+        return display.run, show, async_quit, pygame.quit
+
+    class PdbPlusShow(pdb.Pdb):
+
+        def post_mortem(self, t):
+            self.reset()
+            while t.tb_next is not None:
+                t = t.tb_next
+            self.interaction(t.tb_frame, t)        
+
+        show = None
+
+        def _show(self, page):
+            if not self.show:
+                print "*** No display"
+                return
+            self.show(page)
+
+        def do_show(self, arg):
+            if '.' in arg:
+                name = ''
+                obj = None
+                for comp in arg.split('.'):
+                    name += comp
+                    obj = getattr(obj, comp, None)
+                    if obj is None:
+                        try:
+                            obj = __import__(name, {}, {}, ['*'])
+                        except ImportError:
+                            print "*** Not found: %s" % arg
+                            return
+                    name += '.'
+                if hasattr(obj, 'im_func'):
+                    obj = obj.im_func
+                if obj in t.flowgraphs:
+                    from pypy.translator.tool.graphpage import FlowGraphPage                    
+                    self._show(FlowGraphPage(t, [obj]))
+            else:
+                print "*** Nothing to do"
 
     def debug(got_error):
+        pdb_plus_show = PdbPlusShow()
+        
         if got_error:
             import traceback
             exc, val, tb = sys.exc_info()
@@ -233,16 +275,17 @@
                 print '-'*60
 
             print >> sys.stderr
-            func, args = pdb.post_mortem, (tb,)
+            func, args = pdb_plus_show.post_mortem, (tb,)
         else:
             print '-'*60
             print 'Done.'
             print
-            func, args = pdb.set_trace, ()
+            func, args = pdb_plus_show.set_trace, ()
         if options['-text']:
             func(*args)
         else:
-            start, stop, cleanup = run_server()
+            start, show, stop, cleanup = run_server()
+            pdb_plus_show.show = show
             debugger = run_in_thread(func, args, stop)
             debugger.start()
             start()

Modified: pypy/dist/pypy/translator/tool/pygame/graphdisplay.py
==============================================================================
--- pypy/dist/pypy/translator/tool/pygame/graphdisplay.py	(original)
+++ pypy/dist/pypy/translator/tool/pygame/graphdisplay.py	Fri Apr  1 21:03:54 2005
@@ -637,6 +637,12 @@
      
     def async_quit(self):
         pygame.event.post(pygame.event.Event(QUIT))
+
+    def async_cmd(self, **kwds):
+        pygame.event.post(pygame.event.Event(USEREVENT, **kwds))
+
+    def process_UserEvent(self, event):
+        self.setlayout(event.layout)
     
     def quit(self):
         raise StopIteration