[pypy-svn] r25004 - in pypy/dist/pypy/translator/squeak: . test

[nik at codespeak.net]

Author: nik
Date: Sat Mar 25 23:02:46 2006
New Revision: 25004

Modified:
   pypy/dist/pypy/translator/squeak/opformatter.py
   pypy/dist/pypy/translator/squeak/test/test_llops.py
Log:
fix gensqueak after div/truediv/floordiv cleanup.


Modified: pypy/dist/pypy/translator/squeak/opformatter.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/opformatter.py	(original)
+++ pypy/dist/pypy/translator/squeak/opformatter.py	Sat Mar 25 23:02:46 2006
@@ -33,7 +33,6 @@
         'bool_not':    'not',
 
         'cast_int_to_float': 'asFloat',
-        'float_div':   '/', # overrides the div definition in number_ops
         'float_fmod':  r'\\', # we can't really distinguish mod and fmod
         'float_floor': 'floor',
         # XXX this potentially incorrect (may return LargeIntegers)
@@ -50,7 +49,6 @@
         'sub':       '-',
         'eq':        '=',
         'mul':       '*',
-        'div':       '//',
         'floordiv':  '//',
         'truediv':   '/ asFloat',
         'mod':       r'\\',

Modified: pypy/dist/pypy/translator/squeak/test/test_llops.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/test/test_llops.py	(original)
+++ pypy/dist/pypy/translator/squeak/test/test_llops.py	Sat Mar 25 23:02:46 2006
@@ -58,10 +58,8 @@
     ("add", Signed, 1, 2),
     ("sub", Signed, 1, 3),
     ("mul", Signed, 2, 3),
-    ("div", Signed, 7, 3),
     ("floordiv", Signed, 7, 3), # XXX what about division by zero?
     ("floordiv", Signed, -7, 3),
-    ("truediv", Float, 7, 4),
     ("mod", Signed, 9, 4),
     ("mod", Signed, 9, -4),
     ("eq", Bool, 1, 1),
@@ -135,8 +133,7 @@
     llfunctest(istrue, ())
 
 def test_floatoperations_binary():
-    for llopname in "add", "sub", "mul", "div", "mod", "fmod", \
-            "floordiv", "truediv":
+    for llopname in "add", "sub", "mul", "mod", "fmod", "truediv":
         exec """def lloptest(i):
             f = llop.cast_int_to_float(Float, i)
             return llop.float_%s(Float, f, 1.25)""" % llopname