[pypy-svn] r49237 - in pypy/dist/pypy: lang/prolog/interpreter translator/backendopt/test translator/goal

[arigo at codespeak.net]

Author: arigo
Date: Sat Dec  1 11:05:51 2007
New Revision: 49237

Modified:
   pypy/dist/pypy/lang/prolog/interpreter/term.py
   pypy/dist/pypy/translator/backendopt/test/test_removenoops.py
   pypy/dist/pypy/translator/goal/targetrpystonex.py
Log:
Some remaining usages of id().


Modified: pypy/dist/pypy/lang/prolog/interpreter/term.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/interpreter/term.py	(original)
+++ pypy/dist/pypy/lang/prolog/interpreter/term.py	Sat Dec  1 11:05:51 2007
@@ -1,5 +1,6 @@
 import math
 from pypy.rlib.objectmodel import we_are_translated, UnboxedValue
+from pypy.rlib.objectmodel import compute_unique_id
 from pypy.rlib.rarithmetic import intmask
 from pypy.lang.prolog.interpreter.error import UnificationFailed, UncatchableError
 from pypy.lang.prolog.interpreter import error
@@ -380,7 +381,7 @@
             raise UnificationFailed
 
     def get_unify_hash(self, heap):
-        return intmask(id(self) << TAGBITS | self.TAG)
+        return intmask(hash(self) << TAGBITS | self.TAG)
 
 
 
@@ -572,7 +573,7 @@
         return c
     if isinstance(obj1, Var):
         assert isinstance(obj2, Var)
-        return rcmp(id(obj1), id(obj2))
+        return rcmp(compute_unique_id(obj1), compute_unique_id(obj2))
     if isinstance(obj1, Atom):
         assert isinstance(obj2, Atom)
         return rcmp(obj1.name, obj2.name)

Modified: pypy/dist/pypy/translator/backendopt/test/test_removenoops.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_removenoops.py	(original)
+++ pypy/dist/pypy/translator/backendopt/test/test_removenoops.py	Sat Dec  1 11:05:51 2007
@@ -92,7 +92,7 @@
         s2 = lltype.malloc(S)
         llop.keepalive(lltype.Void, s1)
         llop.keepalive(lltype.Void, s2)
-        return id(s1) + id(s2)
+        return lltype.cast_ptr_to_int(s1) + lltype.cast_ptr_to_int(s2)
     graph, t = get_graph(f, [])
     remove_superfluous_keep_alive(graph)
     ops = getops(graph)

Modified: pypy/dist/pypy/translator/goal/targetrpystonex.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetrpystonex.py	(original)
+++ pypy/dist/pypy/translator/goal/targetrpystonex.py	Sat Dec  1 11:05:51 2007
@@ -1,4 +1,5 @@
 from pypy.translator.test import rpystone
+from pypy.rlib.objectmodel import current_object_addr_as_int
 
 
 def make_target_definition(LOOPS):
@@ -15,7 +16,7 @@
                 g.Array2Glob[i][j] = 0
         g.PtrGlb = None
         g.PtrGlbNext = None
-        return rpystone.pystones(loops), id(g)
+        return rpystone.pystones(loops), current_object_addr_as_int(g)
 
     def target(*args):
         return entry_point, [int]