[pypy-svn] r46028 - in pypy/branch/pypy-more-rtti-inprogress: config jit/timeshifter rpython rpython/memory/gctransform/test rpython/test translator translator/c translator/c/test

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Aug 27 15:51:13 2007
New Revision: 46028

Added:
   pypy/branch/pypy-more-rtti-inprogress/translator/exceptiontransform.py
      - copied, changed from r45508, pypy/dist/pypy/translator/exceptiontransform.py
Removed:
   pypy/branch/pypy-more-rtti-inprogress/translator/c/exceptiontransform.py
   pypy/branch/pypy-more-rtti-inprogress/translator/c/test/test_exceptiontransform.py
Modified:
   pypy/branch/pypy-more-rtti-inprogress/config/translationoption.py
   pypy/branch/pypy-more-rtti-inprogress/jit/timeshifter/oop.py
   pypy/branch/pypy-more-rtti-inprogress/rpython/llinterp.py
   pypy/branch/pypy-more-rtti-inprogress/rpython/memory/gctransform/test/test_transform.py
   pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_llinterp.py
   pypy/branch/pypy-more-rtti-inprogress/translator/translator.py
Log:
merge exceptiontransform from dist



Modified: pypy/branch/pypy-more-rtti-inprogress/config/translationoption.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/config/translationoption.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/config/translationoption.py	Mon Aug 27 15:51:13 2007
@@ -196,8 +196,7 @@
 
     OptionDescription("cli", "GenCLI options", [
         BoolOption("trace_calls", "Trace function calls", default=False,
-                   cmdline="--cli-trace-calls"),
-        BoolOption("exception_transformer", "Use exception transformer", default=False),
+                   cmdline="--cli-trace-calls")
     ]),
 ])
 

Modified: pypy/branch/pypy-more-rtti-inprogress/jit/timeshifter/oop.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/jit/timeshifter/oop.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/jit/timeshifter/oop.py	Mon Aug 27 15:51:13 2007
@@ -2,7 +2,7 @@
 from pypy.rpython.extregistry import ExtRegistryEntry
 from pypy.jit.timeshifter.rcontainer import cachedtype
 from pypy.jit.timeshifter import rvalue, rtimeshift
-from pypy.translator.c import exceptiontransform
+from pypy.translator import exceptiontransform
 from pypy.rlib.unroll import unrolling_iterable
 from pypy.tool.sourcetools import func_with_new_name
 

Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/llinterp.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/llinterp.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/llinterp.py	Mon Aug 27 15:51:13 2007
@@ -312,7 +312,7 @@
                         tracer.dump('raise')
                     exc_data.exc_type  = lltype.typeOf(etype )._defl()
                     exc_data.exc_value = lltype.typeOf(evalue)._defl()
-                    from pypy.translator.c import exceptiontransform
+                    from pypy.translator import exceptiontransform
                     T = resultvar.concretetype
                     errvalue = exceptiontransform.error_value(T)
                     # check that the exc-transformed graph returns the error
@@ -402,7 +402,7 @@
                     evalue = e.args[1]
                     exc_data.exc_type  = etype
                     exc_data.exc_value = evalue
-                    from pypy.translator.c import exceptiontransform
+                    from pypy.translator import exceptiontransform
                     retval = exceptiontransform.error_value(
                         operation.result.concretetype)
                 else:

Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/memory/gctransform/test/test_transform.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/memory/gctransform/test/test_transform.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/memory/gctransform/test/test_transform.py	Mon Aug 27 15:51:13 2007
@@ -3,7 +3,7 @@
 from pypy.rpython.memory.gctransform.support import var_ispyobj
 from pypy.translator.backendopt.support import var_needsgc
 from pypy.translator.translator import TranslationContext, graphof
-from pypy.translator.c.exceptiontransform import ExceptionTransformer
+from pypy.translator.exceptiontransform import ExceptionTransformer
 from pypy.rpython.lltypesystem import lltype
 from pypy.objspace.flow.model import Variable
 from pypy.annotation import model as annmodel

Modified: pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_llinterp.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_llinterp.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/rpython/test/test_llinterp.py	Mon Aug 27 15:51:13 2007
@@ -514,7 +514,7 @@
     res = interp.eval_graph(graph, [1])
 
 def test_half_exceptiontransformed_graphs():
-    from pypy.translator.c import exceptiontransform
+    from pypy.translator import exceptiontransform
     def f1(x):
         if x < 0:
             raise ValueError
@@ -564,7 +564,7 @@
     assert res == 7
 
 def test_exceptiontransformed_add_ovf():
-    from pypy.translator.c import exceptiontransform
+    from pypy.translator import exceptiontransform
     def f(x, y):
         try:
             return ovfcheck(x + y)

Modified: pypy/branch/pypy-more-rtti-inprogress/translator/translator.py
==============================================================================
--- pypy/branch/pypy-more-rtti-inprogress/translator/translator.py	(original)
+++ pypy/branch/pypy-more-rtti-inprogress/translator/translator.py	Mon Aug 27 15:51:13 2007
@@ -111,7 +111,7 @@
             raise ValueError("no rtyper")
         if self.exceptiontransformer is not None:
             return self.exceptiontransformer
-        from pypy.translator.c.exceptiontransform import ExceptionTransformer
+        from pypy.translator.exceptiontransform import ExceptionTransformer
         self.exceptiontransformer = ExceptionTransformer(self)
         return self.exceptiontransformer