[pypy-svn] r12624 - in pypy/dist/pypy/translator: . goal

[arigo at codespeak.net]

Author: arigo
Date: Fri May 20 13:39:25 2005
New Revision: 12624

Modified:
   pypy/dist/pypy/translator/annrpython.py
   pypy/dist/pypy/translator/goal/translate_pypy.py
Log:
Fail again the hard way when we have blocked blocks.  They probably all show
genuine problems by now.


Modified: pypy/dist/pypy/translator/annrpython.py
==============================================================================
--- pypy/dist/pypy/translator/annrpython.py	(original)
+++ pypy/dist/pypy/translator/annrpython.py	Fri May 20 13:39:25 2005
@@ -154,12 +154,9 @@
                         traceback.print_exception(*self.why_not_annotated[block])
                         print '-+' * 30
                         print
-            print "++-" * 20
-            print ('%d blocks are still blocked' %
+                print "++-" * 20
+            raise AnnotatorError('%d blocks are still blocked' %
                                  self.annotated.values().count(False))
-            print "continuing anyway ...."
-            print "++-" * 20
-            
 
     def binding(self, arg, extquery=False):
         "Gives the SomeValue corresponding to the given Variable or Constant."

Modified: pypy/dist/pypy/translator/goal/translate_pypy.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy.py	Fri May 20 13:39:25 2005
@@ -55,10 +55,8 @@
     if listen_port:
         run_async_server()
     if not options['-no-a']:
-        try:
-            a = t.annotate(inputtypes, overrides=pypy_overrides)
-        finally:
-            worstblocks_topten(t.annotator)
+        a = t.annotate(inputtypes, overrides=pypy_overrides)
+        worstblocks_topten(a)
         if not options['-no-s']:
             a.simplify()
         if not options['-no-t']: