[pypy-svn] r35364 - in pypy/branch/jit-real-world/pypy/translator: . tool

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Dec  6 03:36:56 2006
New Revision: 35364

Modified:
   pypy/branch/jit-real-world/pypy/translator/interactive.py
   pypy/branch/jit-real-world/pypy/translator/tool/graphpage.py
Log:
svn merge -r 35338:35361 http://codespeak.net/svn/pypy/dist/pypy/translator/interactive.py  translator/interactive.py
svn merge -r 35338:35361 http://codespeak.net/svn/pypy/dist/pypy/translator/tool/graphpage.py  translator/tool/graphpage.py



Modified: pypy/branch/jit-real-world/pypy/translator/interactive.py
==============================================================================
--- pypy/branch/jit-real-world/pypy/translator/interactive.py	(original)
+++ pypy/branch/jit-real-world/pypy/translator/interactive.py	Wed Dec  6 03:36:56 2006
@@ -19,9 +19,6 @@
 
         self.entry_point = entry_point
         self.context = TranslationContext(config=self.config)
-        # for t.view() to work just after construction
-        graph = self.context.buildflowgraph(entry_point)
-        self.context._prebuilt_graphs[entry_point] = graph
 
         # hook into driver events
         driver_own_event = self.driver._event
@@ -32,6 +29,9 @@
         self.driver_setup = False
 
         self.update_options(argtypes, kwds)
+        # for t.view() to work just after construction
+        graph = self.context.buildflowgraph(entry_point)
+        self.context._prebuilt_graphs[entry_point] = graph
 
     def view(self):
         self.context.view()

Modified: pypy/branch/jit-real-world/pypy/translator/tool/graphpage.py
==============================================================================
--- pypy/branch/jit-real-world/pypy/translator/tool/graphpage.py	(original)
+++ pypy/branch/jit-real-world/pypy/translator/tool/graphpage.py	Wed Dec  6 03:36:56 2006
@@ -375,7 +375,10 @@
     that means just including direct callers and callees"""
 
     def graph_name(self, centers):
-        return 'LCG_%s' % nameof(centers[0])
+        if centers:
+            return 'LCG_%s' % nameof(centers[0])
+        else:
+            return 'EMPTY'
 
     def do_compute(self, dotgen, centers):
         centers = dict.fromkeys(centers)