[pypy-svn] r22582 - in pypy/dist/pypy/translator/llvm: . test

[ericvrp at codespeak.net]

Author: ericvrp
Date: Tue Jan 24 13:13:13 2006
New Revision: 22582

Modified:
   pypy/dist/pypy/translator/llvm/database.py
   pypy/dist/pypy/translator/llvm/test/test_lladdresses.py
Log:
Fix for fix


Modified: pypy/dist/pypy/translator/llvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/database.py	(original)
+++ pypy/dist/pypy/translator/llvm/database.py	Tue Jan 24 13:13:13 2006
@@ -10,9 +10,9 @@
      VoidArrayNode, ArrayTypeNode, VoidArrayTypeNode
 from pypy.translator.llvm.opaquenode import OpaqueNode, ExtOpaqueNode, \
      OpaqueTypeNode, ExtOpaqueTypeNode
-from pypy.rpython.lltypesystem import lltype
+from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.objspace.flow.model import Constant, Variable
-from pypy.rpython.memory.lladdress import address, NULL
+from pypy.rpython.memory.lladdress import NULL
 
 log = log.database 
 
@@ -38,7 +38,7 @@
             lltype.Void: "void",
             lltype.UnsignedLongLong: "ulong",
             lltype.SignedLongLong: "long",
-            address: "sbyte*"}
+            llmemory.Address: "sbyte*"}
 
         # 32 bit platform
         if sys.maxint == 2**31-1:
@@ -362,7 +362,7 @@
             repr = str(ord(value))
         elif type_ is lltype.Float:
             repr = self.float_to_str(value)
-        elif type_ is address:
+        elif type_ is llmemory.Address:
             assert value == NULL
             repr = 'null' 
         else:

Modified: pypy/dist/pypy/translator/llvm/test/test_lladdresses.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_lladdresses.py	(original)
+++ pypy/dist/pypy/translator/llvm/test/test_lladdresses.py	Tue Jan 24 13:13:13 2006
@@ -4,7 +4,6 @@
 from pypy.rpython.objectmodel import free_non_gc_object                                              
 import py
 
-py.test.skip("WIP")
 
 def test_null():
     def f():