[pypy-svn] r12137 - pypy/dist/pypy/translator/llvm

[pedronis at codespeak.net]

Author: pedronis
Date: Mon May  9 20:31:19 2005
New Revision: 12137

Modified:
   pypy/dist/pypy/translator/llvm/funcrepr.py
   pypy/dist/pypy/translator/llvm/genllvm.py
   pypy/dist/pypy/translator/llvm/representation.py
   pypy/dist/pypy/translator/llvm/typerepr.py
Log:
tweak to let the tests unrelated to exceptions pass



Modified: pypy/dist/pypy/translator/llvm/funcrepr.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/funcrepr.py	(original)
+++ pypy/dist/pypy/translator/llvm/funcrepr.py	Mon May  9 20:31:19 2005
@@ -4,14 +4,13 @@
 from types import FunctionType, MethodType
 
 from pypy.objspace.flow.model import Variable, Constant, Block, Link
-from pypy.objspace.flow.model import last_exception, last_exc_value
 from pypy.objspace.flow.model import traverse, checkgraph
 from pypy.annotation import model as annmodel
 from pypy.annotation.builtin import BUILTIN_ANALYZERS
 from pypy.translator.llvm import llvmbc
 from pypy.translator.unsimplify import remove_double_links
 
-from pypy.translator.llvm.representation import debug, LLVMRepr, CompileError
+from pypy.translator.llvm.representation import debug, LLVMRepr, CompileError, last_exception, last_exc_value
 from pypy.translator.llvm.typerepr import TypeRepr, PointerTypeRepr
 
 debug = False

Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py	Mon May  9 20:31:19 2005
@@ -5,7 +5,7 @@
 import autopath
 import sets, StringIO
 
-from pypy.objspace.flow.model import Constant, last_exception, last_exc_value
+from pypy.objspace.flow.model import Constant
 from pypy.annotation import model as annmodel
 from pypy.translator import transform
 from pypy.translator.translator import Translator

Modified: pypy/dist/pypy/translator/llvm/representation.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/representation.py	(original)
+++ pypy/dist/pypy/translator/llvm/representation.py	Mon May  9 20:31:19 2005
@@ -2,7 +2,10 @@
 import sets
 
 from pypy.objspace.flow.model import Variable, Constant
-from pypy.objspace.flow.model import last_exception, last_exc_value
+# xxx tweak just so that unrelated tests can work
+from pypy.objspace.flow.model import last_exception # this one is only used for the exitswitch now!!!
+last_exc_value = object()
+
 from pypy.annotation import model as annmodel
 from pypy.translator.llvm.lazyattribute import MetaLazyRepr
 LLVM_SIMPLE_TYPES = {annmodel.SomeChar: "sbyte",

Modified: pypy/dist/pypy/translator/llvm/typerepr.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/typerepr.py	(original)
+++ pypy/dist/pypy/translator/llvm/typerepr.py	Mon May  9 20:31:19 2005
@@ -4,7 +4,6 @@
 from types import ClassType
 
 from pypy.objspace.flow.model import Variable, Constant
-from pypy.objspace.flow.model import last_exception, last_exc_value
 from pypy.annotation import model as annmodel
 from pypy.annotation.listdef import ListDef