[pypy-svn] r12865 - pypy/dist/pypy/rpython

[ericvrp at codespeak.net]

Author: ericvrp
Date: Sun May 29 11:11:42 2005
New Revision: 12865

Modified:
   pypy/dist/pypy/rpython/rfloat.py
   pypy/dist/pypy/rpython/rint.py
Log:
fixed some typos. Tests will follow (probably tonight)


Modified: pypy/dist/pypy/rpython/rfloat.py
==============================================================================
--- pypy/dist/pypy/rpython/rfloat.py	(original)
+++ pypy/dist/pypy/rpython/rfloat.py	Sun May 29 11:11:42 2005
@@ -1,6 +1,6 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation.model import SomeFloat, SomeInteger, SomeBool, SomePBC
-from pypy.rpython.lltype import Signed, Unsigned, Bool, Float
+from pypy.rpython.lltype import Signed, Unsigned, Bool, Float, Void
 from pypy.rpython.rtyper import TyperError
 
 
@@ -122,10 +122,10 @@
 
     rtype_nonzero = rtype_is_true
 
-    def rtype_neg(s_int):
-        vlist = receive(Float)
+    def rtype_neg(_, hop):
+        vlist = hop.inputargs(Float)
         return hop.genop('float_neg', vlist, resulttype=Float)
 
-    def rtype_pos(s_int):
-        v_list = receive(Float)
+    def rtype_pos(_, hop):
+        vlist = hop.inputargs(Float)
         return vlist[0]

Modified: pypy/dist/pypy/rpython/rint.py
==============================================================================
--- pypy/dist/pypy/rpython/rint.py	(original)
+++ pypy/dist/pypy/rpython/rint.py	Sun May 29 11:11:42 2005
@@ -1,6 +1,6 @@
 from pypy.annotation.pairtype import pairtype
 from pypy.annotation.model import SomeFloat, SomeInteger, SomeBool, SomePBC
-from pypy.rpython.lltype import Signed, Unsigned, Bool, Float
+from pypy.rpython.lltype import Signed, Unsigned, Bool, Float, Void
 from pypy.rpython.rtyper import TyperError
 
 
@@ -189,7 +189,7 @@
             return hop.genop('int_neg', vlist, resulttype=Signed)
 
     def rtype_pos(_, hop):
-        if s_int.unsigned:
+        if hop.s_result.unsigned:
             vlist = hop.inputargs(Unsigned)
         else:
             vlist = hop.inputargs(Signed)